From 451d04ad1b939e3f8afcc7a795367bd120ed609d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 3 May 2016 23:52:02 -0700 Subject: [PATCH 001/468] Cleanup before working on v4.0 --- .travis.yml | 24 - README.md | 49 - common/PubnubUnitTest.py | 34 - dev-requirements.txt | 3 - docs/Makefile | 177 - docs/build/doctrees/environment.pickle | Bin 10130 -> 0 bytes docs/build/doctrees/index.doctree | Bin 410829 -> 0 bytes docs/build/html/.buildinfo | 4 - docs/build/html/_sources/index.txt | 35 - docs/build/html/_static/ajax-loader.gif | Bin 673 -> 0 bytes docs/build/html/_static/basic.css | 537 --- docs/build/html/_static/comment-bright.png | Bin 3500 -> 0 bytes docs/build/html/_static/comment-close.png | Bin 3578 -> 0 bytes docs/build/html/_static/comment.png | Bin 3445 -> 0 bytes docs/build/html/_static/default.css | 256 -- docs/build/html/_static/doctools.js | 238 -- docs/build/html/_static/down-pressed.png | Bin 368 -> 0 bytes docs/build/html/_static/down.png | Bin 363 -> 0 bytes docs/build/html/_static/file.png | Bin 392 -> 0 bytes docs/build/html/_static/jquery.js | 2 - docs/build/html/_static/minus.png | Bin 199 -> 0 bytes docs/build/html/_static/plus.png | Bin 199 -> 0 bytes docs/build/html/_static/pygments.css | 62 - docs/build/html/_static/searchtools.js | 622 ---- docs/build/html/_static/sidebar.js | 159 - docs/build/html/_static/underscore.js | 31 - docs/build/html/_static/up-pressed.png | Bin 372 -> 0 bytes docs/build/html/_static/up.png | Bin 363 -> 0 bytes docs/build/html/_static/websupport.js | 808 ----- docs/build/html/genindex.html | 358 -- docs/build/html/index.html | 1555 --------- docs/build/html/objects.inv | Bin 411 -> 0 bytes docs/build/html/py-modindex.html | 112 - docs/build/html/search.html | 105 - docs/build/html/searchindex.js | 1 - docs/source/conf.py | 261 -- docs/source/index.rst | 35 - pubnub.py | 2927 ----------------- python-tornado/LICENSE | 27 - python-tornado/README.md | 137 - python-tornado/examples/audit.py | 35 - python-tornado/examples/grant.py | 35 - python-tornado/examples/here-now.py | 36 - python-tornado/examples/history.py | 37 - python-tornado/examples/presence_group.py | 67 - python-tornado/examples/publish.py | 36 - python-tornado/examples/revoke.py | 35 - python-tornado/examples/subscribe.py | 52 - python-tornado/examples/subscribe_group.py | 69 - python-tornado/migration.md | 205 -- python-tornado/tests/test_grant_async.py | 354 -- python-tornado/tests/test_publish_async.py | 333 -- python-twisted/LICENSE | 27 - python-twisted/README.md | 137 - python-twisted/examples/audit.py | 35 - python-twisted/examples/echo-client.py | 99 - python-twisted/examples/echo-server.py | 104 - python-twisted/examples/grant.py | 35 - python-twisted/examples/here-now.py | 35 - python-twisted/examples/history.py | 35 - python-twisted/examples/publish.py | 36 - python-twisted/examples/revoke.py | 35 - python-twisted/examples/subscribe.py | 52 - python-twisted/examples/subscribe_group.py | 54 - python-twisted/migration.md | 205 -- python-twisted/tests/benchmark.py | 90 - python-twisted/tests/delivery.py | 168 - python-twisted/tests/subscribe-test.py | 156 - python-twisted/tests/test_grant_async.py | 365 -- python-twisted/tests/test_publish_async.py | 333 -- python-twisted/tests/unit-test-full.py | 230 -- python/LICENSE | 27 - python/README.md | 400 --- python/examples/audit.py | 35 - python/examples/config | 9 - python/examples/config_osx | 8 - python/examples/console-help.txt | 37 - python/examples/console.py | 719 ---- python/examples/cr.py | 52 - python/examples/dev-console.py | 273 -- python/examples/grant.py | 35 - python/examples/heartbeat.py | 106 - python/examples/here-now.py | 35 - python/examples/history.py | 47 - python/examples/pam_demo/demo.py | 126 - python/examples/presence.py | 32 - python/examples/publish.py | 36 - python/examples/pubnub-console/pubnub-console | 724 ---- python/examples/pubnub-console/setup.py | 27 - python/examples/requirements.pip | 3 - python/examples/revoke.py | 35 - python/examples/start-console.sh | 38 - python/examples/state.py | 123 - python/examples/subscribe.py | 53 - python/examples/subscribe_group.py | 69 - python/examples/where-now.py | 38 - python/examples/wildcard_subscribe.py | 96 - python/migration.md | 205 -- python/tests/test_cg.py | 96 - python/tests/test_grant.py | 90 - python/tests/test_history.py | 65 - python/tests/test_wildcard.py | 360 -- run-tests.sh | 15 - setup.py | 26 - 104 files changed, 16124 deletions(-) delete mode 100755 .travis.yml delete mode 100644 README.md delete mode 100755 common/PubnubUnitTest.py delete mode 100755 dev-requirements.txt delete mode 100644 docs/Makefile delete mode 100644 docs/build/doctrees/environment.pickle delete mode 100644 docs/build/doctrees/index.doctree delete mode 100644 docs/build/html/.buildinfo delete mode 100644 docs/build/html/_sources/index.txt delete mode 100644 docs/build/html/_static/ajax-loader.gif delete mode 100644 docs/build/html/_static/basic.css delete mode 100644 docs/build/html/_static/comment-bright.png delete mode 100644 docs/build/html/_static/comment-close.png delete mode 100644 docs/build/html/_static/comment.png delete mode 100644 docs/build/html/_static/default.css delete mode 100644 docs/build/html/_static/doctools.js delete mode 100644 docs/build/html/_static/down-pressed.png delete mode 100644 docs/build/html/_static/down.png delete mode 100644 docs/build/html/_static/file.png delete mode 100644 docs/build/html/_static/jquery.js delete mode 100644 docs/build/html/_static/minus.png delete mode 100644 docs/build/html/_static/plus.png delete mode 100644 docs/build/html/_static/pygments.css delete mode 100644 docs/build/html/_static/searchtools.js delete mode 100644 docs/build/html/_static/sidebar.js delete mode 100644 docs/build/html/_static/underscore.js delete mode 100644 docs/build/html/_static/up-pressed.png delete mode 100644 docs/build/html/_static/up.png delete mode 100644 docs/build/html/_static/websupport.js delete mode 100644 docs/build/html/genindex.html delete mode 100644 docs/build/html/index.html delete mode 100644 docs/build/html/objects.inv delete mode 100644 docs/build/html/py-modindex.html delete mode 100644 docs/build/html/search.html delete mode 100644 docs/build/html/searchindex.js delete mode 100644 docs/source/conf.py delete mode 100644 docs/source/index.rst delete mode 100755 pubnub.py delete mode 100644 python-tornado/LICENSE delete mode 100644 python-tornado/README.md delete mode 100755 python-tornado/examples/audit.py delete mode 100755 python-tornado/examples/grant.py delete mode 100755 python-tornado/examples/here-now.py delete mode 100755 python-tornado/examples/history.py delete mode 100755 python-tornado/examples/presence_group.py delete mode 100755 python-tornado/examples/publish.py delete mode 100755 python-tornado/examples/revoke.py delete mode 100755 python-tornado/examples/subscribe.py delete mode 100755 python-tornado/examples/subscribe_group.py delete mode 100644 python-tornado/migration.md delete mode 100755 python-tornado/tests/test_grant_async.py delete mode 100755 python-tornado/tests/test_publish_async.py delete mode 100644 python-twisted/LICENSE delete mode 100644 python-twisted/README.md delete mode 100755 python-twisted/examples/audit.py delete mode 100755 python-twisted/examples/echo-client.py delete mode 100755 python-twisted/examples/echo-server.py delete mode 100755 python-twisted/examples/grant.py delete mode 100755 python-twisted/examples/here-now.py delete mode 100755 python-twisted/examples/history.py delete mode 100755 python-twisted/examples/publish.py delete mode 100755 python-twisted/examples/revoke.py delete mode 100755 python-twisted/examples/subscribe.py delete mode 100755 python-twisted/examples/subscribe_group.py delete mode 100644 python-twisted/migration.md delete mode 100755 python-twisted/tests/benchmark.py delete mode 100755 python-twisted/tests/delivery.py delete mode 100755 python-twisted/tests/subscribe-test.py delete mode 100755 python-twisted/tests/test_grant_async.py delete mode 100755 python-twisted/tests/test_publish_async.py delete mode 100644 python-twisted/tests/unit-test-full.py delete mode 100644 python/LICENSE delete mode 100644 python/README.md delete mode 100755 python/examples/audit.py delete mode 100644 python/examples/config delete mode 100644 python/examples/config_osx delete mode 100644 python/examples/console-help.txt delete mode 100755 python/examples/console.py delete mode 100755 python/examples/cr.py delete mode 100755 python/examples/dev-console.py delete mode 100755 python/examples/grant.py delete mode 100755 python/examples/heartbeat.py delete mode 100755 python/examples/here-now.py delete mode 100755 python/examples/history.py delete mode 100755 python/examples/pam_demo/demo.py delete mode 100755 python/examples/presence.py delete mode 100755 python/examples/publish.py delete mode 100644 python/examples/pubnub-console/pubnub-console delete mode 100644 python/examples/pubnub-console/setup.py delete mode 100644 python/examples/requirements.pip delete mode 100755 python/examples/revoke.py delete mode 100755 python/examples/start-console.sh delete mode 100755 python/examples/state.py delete mode 100755 python/examples/subscribe.py delete mode 100755 python/examples/subscribe_group.py delete mode 100755 python/examples/where-now.py delete mode 100755 python/examples/wildcard_subscribe.py delete mode 100644 python/migration.md delete mode 100755 python/tests/test_cg.py delete mode 100755 python/tests/test_grant.py delete mode 100755 python/tests/test_history.py delete mode 100755 python/tests/test_wildcard.py delete mode 100755 run-tests.sh delete mode 100755 setup.py diff --git a/.travis.yml b/.travis.yml deleted file mode 100755 index 48b3e64f..00000000 --- a/.travis.yml +++ /dev/null @@ -1,24 +0,0 @@ -language: python -sudo: false -addons: - apt: - packages: - - libssl-dev - - libffi-dev -python: - - '2.6' - - '2.7' - - '3.2' - - '3.3' - - '3.4' - - '3.5' - -before_install: - - pip install -r dev-requirements.txt - - if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install twisted tornado pyopenssl; fi - -install: - python setup.py install - - -script: ./run-tests.sh diff --git a/README.md b/README.md deleted file mode 100644 index 64eada3b..00000000 --- a/README.md +++ /dev/null @@ -1,49 +0,0 @@ -# PubNub Python SDK - -[![Build Status](https://travis-ci.org/pubnub/python.svg?branch=master)](https://travis-ci.org/pubnub/python) -[![PyPI](https://img.shields.io/pypi/v/pubnub.svg)](http://github.com/pubnub/python) - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Clients for Python, including Twisted and Tornado - -## Communication -- If you **need help** or have a **general question**, contact -- If you **want to contribute**, please open a pull request against the `develop` branch. - -## Installation -``` -pip install pubnub -``` -Examples and instructions for the SDK are available in their accompanying README.md, migration.md and examples directories under their specific platform directories: - -[Standalone Python - Everyday python for your scripts and apps](python) - -[Tornado - For use with the Python Tornado Framework](python-tornado) - -[Twisted - For use with the Python Twisted Framework](python-twisted) - -## Migration and Reversion -If you need to revert to the previous version of PubNub, run this commandline: - -``` -pip install pubnub==3.3.5 -``` - -Migration information for the SDK are available in their migration.md under their specific platform directories: - -Migration docs for Python Standalone are [found here.](python/migration.md) - -Migration docs for Tornado are [found here.](python-tornado/migration.md) - -Migration docs for Twisted [found here.](python-twisted/migration.md) - -## Pubnub Console -Pubnub console is a command line app which allows you to do various -pubnub operations like publish, subscribe, getting history, here now, -presence etc from command line - -``` -pip install pubnub-console -``` - -## Contact support@pubnub.com for all questions diff --git a/common/PubnubUnitTest.py b/common/PubnubUnitTest.py deleted file mode 100755 index 36ce4446..00000000 --- a/common/PubnubUnitTest.py +++ /dev/null @@ -1,34 +0,0 @@ - -class Suite(): - def __init__(self, pubnub, expected): - self.pubnub = pubnub - self.total = expected - self.passed = 0 - self.failed = 0 - self.started = False - - def test(self, condition, name, message=None, response=None): - - if condition: - self.passed += 1 - msg = "PASS : " + name - if message: - msg += ", " + message - if response: - msg += ", " + response - print(msg) - else: - self.failed += 1 - msg = "FAIL : " + name - if message: - msg += ", " + message - if response: - msg += ", " + response - print(msg) - - if self.total == self.failed + self.passed: - print("\n======== RESULT ========") - print("Total\t:\t", self.total) - print("Passed\t:\t", self.passed) - print("Failed\t:\t", self.failed) - self.pubnub.stop() diff --git a/dev-requirements.txt b/dev-requirements.txt deleted file mode 100755 index ea54f1b3..00000000 --- a/dev-requirements.txt +++ /dev/null @@ -1,3 +0,0 @@ -flake8==2.5.2 -gevent==1.0.2 -nose==1.3.7 diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 0736a139..00000000 --- a/docs/Makefile +++ /dev/null @@ -1,177 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = build - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - rm -rf $(BUILDDIR)/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PubNub.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PubNub.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/PubNub" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PubNub" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/docs/build/doctrees/environment.pickle b/docs/build/doctrees/environment.pickle deleted file mode 100644 index 6acb7b9fa46d465fb953286f733b2bdf2724a69b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10130 zcmb7KX@DF>72X_sO|rYW2{|YCEXmH~A_+GMIS3(}ut|{-7>Ayj-tFGZc28AzXLluy zL`jpND2k#eilQijq9}@@D2n%e;jMUac;5%!->dGP-kzNa_@`bS?|b!*s_v@Seci-V z(W+>=F_Kn|Bf2n+A=R)G+Z?@I+A*esPcZpJmrqKu)>64&FRK=x90DC%FDG`Q&rpU` zX6SsoUbGXux%(JzDdzJ9$g*`KpHEmSx?6L{`*>S{O;Rcq-rmdF^TUcT`W>Ul6TPg( z)@>3##pP48%}q^Bx=~U`ct^2h7HJ+UZI~t1N=UW@@5CHkE}xcS?Lry0Oh*(|KAknO zgksx5FE}=2&2ah56l*Iv6;jaRvvPbkYb}-)%R*~Tj-STb3QF;?Q2Q-DH^)zBlk}3s z=jHf(*6c$TETv6T>h0F zzpAnEs!7Dq7#CRbxLU`XAxNke zG*Nkf95vu^t&Y7x-~xN~IA+k}hqJS5eS{~gZ)iErJ>+p?y!S&_nsMfe$9Z<#j?V&9e4pJIhrGn&FC9Ng=w`W3Z;B&c=JA);Syy2gZ;o@n!sD;Z&K&0?Uzc0r zysz^3tLyM8PD!`J~5MYVE6y`z}j7KgpgMxy&ivG9qv%}199&6 zd;9~9m$<)F9*jdi=HlNS;6VNZ)`AK8^#T6F@KEQs6Bo(u1pg7v@sGRw$0^p~WAc{M->;AGpRmbk^5#$3 zbe#QkquyFU>mk>Q+%LmlZ=b9jNmQ1zs{Mqe36hZ2rsa zbVyylcHPD`!ExW0{VUdKt3wqWYgH>>QEZL>I>&#*68UN`|E0-E zSi-j_jZy6>?P(l>6vI)WH<$q_*8`7K8oA@)VHL#ffBRqkTL;uM-eH{Ui zlkk7J{NHT4W)GD$wOq*;AV%Ip{=?dRr4c0lUu}){3`^k1t{QaXutd{@rly>jfRfD! zZ=EA{T5)U>05K5*3Y$h^VFoS(Md>v$Nx~)*tTh-A&5}1Ed2J19i559tQu`IBY>QTE zwZmf&F`!za4egw0M;Wddksy{9f6Is|XlPI6#8jeBD|;r`q61ZhC59B7p9RH7bfRZa z!kTfHbt<9@9qh`ib1-}lsvOgvMy}>yx|Px z5j&w{Y_=SmgHr3*(`>O8eMstm8uj2xE#^{%o)Y48)Cz1m&;>j!O4X-`m{(<)j~Yw# zn~qT;11zz?9})|Rb|{dtNV1eoW5B<9i^b@0MN%?oT^5^KQY$L%Sw@lcTOvo7`lGEm zu?#h~Hse?#BkyvVvR(+DJL}V%G9{cedn&kGlMxxL4Fh)|?3?9)(d;WgEjBH90OoZ= zu2f5`M87Lmq0~BZA|<)nY1`zbm%HWg87SFgU@fs)cC10Ejms4joN`&U^SEf)3DE-< zcrh*cGbnNY#yxO`E7r=!tejYfiZ&-F))SqZ6B~%m%ZZId7v#j5ppLdECpMvys!apX zGO#RWuc9TyRxo1jZ6L0=h*06&+hqfD??8p--boa5?;?u1FD8n) zcZ1U0q(9Al323dg$eCd6;rf&idoYX{F9mVMUX;}td#ORWhN4DqTQOJEMD9I(=$by?d2ZR0cGSpr1a+FoMH&Y|FUtWP8 z*19ZsSG|&2;oi9g4S(;vifWks)kLAytwf>KYluRN*Mg4OJGY@J_YPS`TD^{FGJNsl zK`ma79_)|XL0s_$lu&W(_!|kaVvtObyJfJtMF#!-Aa_vpi74)njA5kSgqADbjIwI^ zow5Pl-+~J1{#K%}=`N!1=-Y_GmbZhBjnv&}hmm>*>aMs4WmWFIvH`j8M1|zOizwvY zM-+13O%!t914?p9H}c8-pkbumi@Gb`hq5a70cyk|^?vlQ&LC2@e`ymRpw2L052E1* z?1NN;5+5Q8PL_vWW$1L}Vo6;l5*L}AuviNd#^BMNgq4>~qx zUqCyI*%wiF#g|Z4efwqEfZVU3LUO-K6mq{t6mq{#6mq`-N^(gza?3YC!pY63gv!86v{jfIwod6MpMR& z3?$`#LNpe$V7{MX05SU+h%0`MvLzd2;DV7eG2`q zcp7EZNxzT{*!N3R$i80@h26g<3g`cZDD3?$C^QRhRkF6B&ZAtu_M#9Mc2Ms^6|D_rrAdMeGB!le+m{jw@L(9CxES7AKplPN#V(Jdbme!a&(tg|LtbP{+_V&;y)$nOG4 z-Jm-!gmi275_4C?Ou0gtTS;{%Q^DEaCrST9N4It>L8e8JBp^Y)r!nXO0!@#Df`o2k zP?H5`>x+p~$2l%h?!oGl6DDAet)7mNiB_M5s9t zil(agpOhMd?kCV`5oj?${^yLw7?Ut_Bg|4@s#(s)u)7F$dIY0ST9n^zj5tP!c@bhc z5M%PTje$21aDD_NtNgVVyzP>yaqIOEVHQM~6~NSAuc3@^**-|fg%NTUkd2mYE%rXb zE{bCtt=?Mf^@Lp!Y+-lG;za~ zT?_6f@UjR@6E|Amwb&wImq*x@z&2Rtwa_aFx*~#h1KN1G*P`zx^vVcLYq;*JuLT|? z;Hn6?8o*O6{#yLCgil5IF?+y2J=EC)j}WFi!kl6c1Tw-s@F*eAh>)k;12x!(3A;Lu zZMX+&usOo6iLj^G12xDILiR++Q}2Nq@MQ!}N8nTLfg0@Xgv~_QQ}2Nq@ErtR8-Y)` z2Wqgrgk2Y5PqhbXpgKX8Zc!DiNnszAPZ<@AY+G@U<9m-qCz^URKFr8!x4Qcv(nZCk^bJ2rr#|(>p z7;y?R$(kSOH^q=RPclzak-shZd3#G!Ra=}d`=?e^KeL{9L|I&bKDJo1?aJAi%<%9q zlBo1;CvA!W`rMNNvy~AS5?3cOyHa{;UdqtUBa# z9gs{3aS^zXUD^)fiXABNFA_QJ)eN`&8eaAMo>*(&@o%@a+ z+S=Eo9esWK`i>sharutE9o?BL*Y<48UDYiv24YW>*C%!pv@QG%Ok9FyFOuq$ z@JE{1gN8PdO%?q``I$jF<5B|551e6}CVmUkRl8q0gT4r4#9rckv^y%;>fx`O|SqzTBLihZ)XQ#UG(4c;RC2sI$~lcaXX?(f;sW9b9pGPE5wO=hi- za)&eImo?FcepehI?oMQ;@`$&ed9%bpImBqFD{ts_MK2!C>jQ=fM_!IzKb?OFH6+LX E2V4Oti2wiq diff --git a/docs/build/doctrees/index.doctree b/docs/build/doctrees/index.doctree deleted file mode 100644 index 2d04154a598301fbf6999a0ed08dfa058b9e4606..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 410829 zcmeF41$Z2{)`n9GxXj#cQ;5?h4yUb)DN|BN+`5paYwsrZ#_@V(JJ5E@kd&F3nfaEP znVEab%=EwC(ah|wy-u9A>Fs^~o5#^NI?_nrIY-jWXf>LBX0J_UYg=3D8=5N`v#E4* znW7WYjV)!l*?RArn?1XB zlc{V)Q)^8_eREx|>(uIHJIYg+cIh#V*-5!>Q>&M3muXUcb4xl^(NaGlo$FqzlrTeF zN{^}4OLtU?OHa&>Pv^>}cFZ{4SnH-VwdCe5l_#t#(rTXR@M&`CX39$E=ABx-5Pa$z zQ}wm!=0vhFm1s%UG+?{=MpQ4_mT7FU`Aex0S~XN-fvF|VkN7V*wR(|ug@-3DG_`uM zc4@Hz7oLvhb$BD|rsNixTD?@;5+a|EbIHb*+@e#fdy->Px}i2ZA)RQ+Ca@X}q*rqy zYEsFT`fTG0xy43QC)$-2TDrBdxwWRb*45XfbBj-{?n*viOm2x0X4Y*ATb*wuOO|Rz zq2;U@Ej1klBl9g?qL7M0Hp`T-R zlx$7ax8zosTD@G`vm&qLEAClJ{m?#9{VSGg*-@X4TJ}m)OE@mfRA{P|r&iA!JFdms zD7VUp5?n+3<+=9qrxtlRS6)hi@YGb=ci-M6n*XS<>QzfwK00x=>G;)KxlgIy6L534Vc?QQs2VxooyVGN{?;M4GeOFs^)7- zy5{tl3F+qMCq$Xbazh#IR}XS)FxtE1q~>g^V=P;gmJ<<{cVwS(L`<#pt*tE^Le-5|GK6ra7SYgpd;ZOd@!CfC|nU(2PZ zEH|ur4Vq2AI>wKFld^7nQ)55h`TM2P6VnaZrhZLRTI#Zm{TNW1`}rdKG0vtZSGeYu z+y)2ko7*tRZB$d$ttB~5m#o~zRo$9B%iJbaWyzKn2A0+qOtNW^+pN5*d#bfb`I>W^ zkIrpT)vdN6+1yNQ%h9>5s=C)CYsWhob@=Gqh^jg2Q_Z=pN9VSwS|J?c`nF{IdVYPI z`xcFHxowkGbNPa|8=V_jw^*{ZYR-oG#&mAfmfff|yu{|J>SnL%URzh+kix>b?MLT! zXy+!}+kk1RG3ky$ZYNA?!|V?EVV1r!qSP?EGoDztZvDCq>o%^M%ZkbEQitB7%j?i~ z*E*COQ-^B1)uC0g4x%-!b?~c$RUKSv+xlu$dNOwfsm|7)#vNmW+&C!LiOY_yHObbR zwuN%BXv(%Wrpj`4s8}E5GEu9ExOb1TE8t)x~o`(jx!y-K~a#fGDldUaT8s)mV z!)YsBecs#=()dWT_E92yv<>PLvZ>aFbYDL}=Z-ORA6qq7eKQHUc=;R=GN&%xf(U{BI@Kmulty~07m&MMI#m-bUXQ`UA^A9}S`_-WArVuB=djXNxoargD0yo}m#b^(EEoFr zS7$x;I;-w_Rd<7`yHVBMB=v6=^SI<&>QW_&`xpK2)*yEqmDQ=}tF3|5$?mrYxjP~S zsc{7QnZ55cd*7wH?v}mpQPuaV!u#^}zJGM?f%3ZZs+W)L94e3~w{bL4-!gqW_HOKP&priT?9d-Lf?qJ;~%=u#Rd>b1yO`Q@F`rs(Z1J=F8>n z8m_XAX|CrA)6(h~n_q$Nt3mEHdGmm_#we#v=!s~|`1F)MiTFk*jB@jmZqe~NBeIR@ zK8f1;CT`0M1oTWhHB4`AZWxnoTxXMHLo>Ovu6|s7<2t>lf`auVp$9UC%U->6ujA=Q ziaYlk^s4!a$>-jbIo~pOzg@R#vZ|}^DYvydrM zbe3D5e9|gm`O#_x3DByi5Uo}eqSZ=5v|1S~)M^#t9W?E@rZU%yTyQG~0@quo&~WC~ zSe73=+^WdMWi?BOOCJf~(pLzV3L#wj3E|QoY^|%zNM-H}+yG&!UAY4hW8XnQ;06;$ z_7xrM8;=?>VK>B5G9m4ucIN8-OzZtc!<<`#6cJz3azMON0*J3Ag!tM*h_54r__|;r z@%1G4O{2Kv^+|yGFd%Rn5JuER$*5uX=Zl-Co%XPXr&#LFHN^Ec2W12$uPe=m>kk^s^vt- zX%e90AwqOKREUm;3DNOzuy9B|f_S-Zf8CKB1@0(|+ss8qB1;$Qd~~@HZeD#xs`tY2C1THN~I9!CyJM_w$Q~;pyd0Xm>K9ZopTDtrcC~J5e6;@etjR za~Z75rh3=);Wpfz!fAzf;_g%gJo9kd?M~w`aHm_rg%-(#q;>c0&amVsrqxCF+wM#x zGWl6Tv^ZOc7Uu}j;#?tGoF{z2Zn8WjcfKSqWdwyjx`23j9XHnQLXHA=k;T`n-V#-d zRIBic*Vb{*mu?8}l8eR$ZmN?F4VuddQ`636ogMdf7gH`*NU7}`Tiu(|@Di&Ig)UV> zpJZL}?XbHHF&*G?AaGX@>b}@rsmy47l@P737NYevLJIk~V2U^NjHmCeRgO=&wJN$P zcGn>;&&)@NA+84kcY{RS9B7ikH>Vqspn~k=Rmd!;L$tWb@8ldJ^fe(&Ul+pk4Ixb51PhtIC3&gK;@c!Z^&KE^?-E8-MX40k_bli8KBrMF z>OAfPQbhINmIJCEN&wZ5gi!rh2-Q!7Q2i7vr23iUo@#N)pOXO9FMz;(Nf=QTrBYPC zvYcQ0oYiHxKi{$4H;BdaTT6!LcM`z!dm%i35W@3EAv}Kq3wi!5d8%!(zaWL=uR!2_ zBaBFjOd&~s;md@Vw%;v(7bYj7{HGxad+WhEgz9XT4At2=5Y;(^P@Pi<)wzUF?Ftrl zif+W)O&jZ8ou7}I>dIVq(&?E!fWVb0Gu>q{_8M+ig~ZsbON>poFb&P6i#gN@_07#p z>o+IHy6lATN4!LH+D%Nm<_b4A1<*;PQr-IDWudA^T%DUo>8LZWRfIb8Nq{=@3sGkQ zA?hqBM4g2|)QRT`-NH&p{c(nia6V326bRg6gy@?IY0C)siSa75%Ho!537@O_D6BGy zpTrXW>Xc}5*@^W$7ABHNGzc)wsb4nvSv8$(NTeroD)9Zb`_swRk2n^HRnfGcT=N zn0Xl?W?oi^nU@n{=H)?|d5&-z(j}CT`e&-V0^D$6PatqB63T_49po`{VcTC4`2DNC zvEF_P^H2OMk&}kMvX!!mFGaskg^iclPR$n;o#c9vP0hF5vSZiY5@6R=h1hj9A$IK} z#IAk8!roXxyj^c>Q_Gloet9c%{m2Tx{y^Xc=sY^+%5!$RTR)cH4dOPWNg3Z%nWSVQcG&Pl(HZ&1nTU#Pn4&4$!X`SY zzNIb^x5T3JHy;~UMSo$EF3}uvNcEwAG`BXiFoLMrH#9^!n~O@|r?zZueUil<39F~5 zGbH%Ukz&N1#UMrJQFBBo(Z1^X773fOjA5*~$XlSOh$4Q{ctVm9PJ@`(sP(9Kh7M@1 zC@YI9lru{BqS&-~XSCF%^IUD*h@DYjf2`C_L;YgJsN;Xkh?q#T0xSQ8sz&-r*XX)z zx{hsav>$m3TVAoY!{YnvXwk+TN)0t`kn%994YomsQEi9>jA}!L zjB2Y38P(PhGODc!>T0o!ZiFj|v>VcxS7iuWizJ4ywSmB`qkQ4Bi49?HT_jM{2$!cg zr%rY2Nd~3$?Ib7-lK@H^2%)s05K0>fp|mj=Q`$sA|AgXe+7tm-jLm?+ZBAHBWDDi5 z%!ua|=O6Be-q}-i^l)JN#a(4k$uDHoFqrvh_cpcf5NZ`gugcCO8 z25m-Hko-Uu-FcL{Y7~rAoxW21v8%((ToL}@RbXaEez%)UU73;B;wGGl`cu-3jpJ&R zjN@vBI4&i`acLor8w;xO&MU8tBT}9TyG|VurYt4GYx*s923~U+^1?{&&NGU-(|9Wg zMh!}a(F7rk8ig>*3Sra)#*A_jraD!-BP$)P83kuGthZ53wGoe@1qOI%bC%Llxh29-z3CuY}mx9CX^dtP~)ekVJL^pUH-oWNN z$4uO`G6?^v8`aK@#u0aJPTi5{L<22793N#0(?E|_E*j`DLK^6?LK^6CLK^7tpc?2x zYM>_&iHGA8i3IK>i5N8!ov@rcnaog<&GUUG8jnx0lAv^|lA&~(5K5;Dp>&22N@s#G zrL!bVb*}oe$xDkl2MFA`gqc7YaH$j+Ib~6yTTL?8Sg@%z|qj4$IZY=tjopP%` zrTQwo-iZgyVKeto$vD)B2gyJB@aS%XJPn}qpmV!vMgzD*xo7})3TXg$326X#3uyrN zfNB7Xs{!0gBp!6`BNDj#CDN@*r%dD?AUmXF-h8W!hMfnkEJ!`1WJow>TwDE`raA)$UQ-Bn#7Yp;GQC!3Gz>?rpk;IFB*EDvBIA9h54c9Ig6mm^BhQ( z7lf$tq7YSH5~9k>poSi^2qu1ocr^69%5mUcBNWL)vG6~rg}K+^1#u~#cV#rdykVr# z|4k*M|64-ze_M$D?+DTVT~MxERPF0M2~+<#P2YzWZRP`jACU+(jD+gTM;#9%AKED& z`BSQ|z=JcM(wV7goLM@CaOd(d)Nyj@LF5zD3nzc7TsZkNAx{2Wh?Bn%;^Z$uIoT#= zz9JG2B3}~;+&2=@#8>Eyf!w#`hLdcYZ+Oud@|_h0r|*>vryqoH`cVj{pM-Gw8H_po zB4MhN_5Vs{n!|5E;C?6UJoPSfP)}t>S{IEVvmp=M?1Yr%N02!zf+BP392A*Lh$3Bu zDAG-cBHclaAZ8CbQ4iwL2vWvz;N~V2M;k$AW|DB$wk|ghydW;+^Nx&0ka>+X`p>6i z^q*gd{tF1ve?cMoF9gbwOKAjISi*1w`3Gsb2()N2ivs+*M~FKzq5ASs`w=8vw{fPI zZzdcaW=93jN{d@bOZbwiwVGl(``LkCV8Vk$GQq2y{I1ZLi07pf^%cxb+vIa}sm#ww zhrddUtDl%|EE~n-x1ApSn!!_GV++gGn-de04XylSW3$$*0dG$93SZgkWj_J-YD!LN z$R<<0%F0G2Cp7VE#&+rECVrVsm+fKG)jh-PJu7>TY_;DWd-m}O;h8-veMbFE)HC`y zqflrG6Q+y_)7mCkvL3&hN$E*GmmQ-hWF>GtD+l!HIjLu5|G?L){Lw$lKB-Oi{+4|} z2icRU3H6O_&hQls2#V(C^D%!!c|n<55+BkDR>s5mPB2I@CNGvU2h$0bRxUchGD14R zvO+q+azZ-6@}N3FMf^i4f_Ri&fk@zbO2jbGol!PwEpA1GRIm1wuRa<~SF$sxeq|+7 z{VGDL?wVU($Pqa^;*J;zl-3ffXV z@04g@T+0}v{n|=K`*nn9zpfDN*At@s`k?8yj1$O?cIl#BhQThK)iPW`!_p0%bQ-6p}gO<plR)*dRKEJ?iZs>EqWWn{rusvKRDYJJlA{o!C-{SgxSMUh2S z9f_Q_b`%h}qX|nAI!0$#W<W(fQgb>aHdU0y0RRK-9*rvGX8st&$;doe%=o3n6fW5CS)X zF@c*TOqHtaW>RQnw*Z0r7hwmaZdD1D8Idn)XSdmjxBC-)JG;XoP`r}^QM^kC#k+-2 zyhjMddqFh^(-bq^M?AU#x}W2~JwPZz<7A~yjx~SQ{|{0pq@-Bh{L%f*Lq-VQ9#%5C zJt9Q6M}_G2m=N6_2W9?p`Tq$CQ-7-#Pf{g*eF_NN(}b8Y6RIZLniKieEC2MSh<~Vy zeDI8&{H#B@n#Z^<0fw>88+VMzFwa>o4D&n(GRzA?4D+H8!@MNKFfW5L%xW^sD-x!B z(Xf4$D07O0a(YyuXc%2RcE%5z?diU5XTQ-!i0<1$=)NO_?z=+h zz6XkKAJKhZ!aUs%h%)C!SV&hiBDz&`7u-;}4=p9K?nid^$Kl!BM|KJNxKD^;-xUdj{iwGgOs1SmSfe?(g1aONJk8HC9$AMdtP$un-ZJPY+?e^A7qP$oB z{;pT=wGxRH6C<@|a5!rQ-BO$dJMnGr@TILt*e#=E*exrB-EuX# zH_(bMd}mC%N!a^hgDk1=eX+qvWa=S8bQmf`ht-AXu!ayF))W@KFIFkZOBq37%UO%K ze_w2Ej#!Fl@ihx}oQht!iqsCL&U(9b$x3697KN{Xt!E{`aeXE9ZubhmY;(l%OJG|N3EY+v(JQpIK&X$~ zN@ugeQDCo4#;<`5x7?5#p)^QsEyU{E2+?p`Atbj03ynHba=)KIRLdwtXk7)chLI2& z)=EXp4;JBzU^`fr>Vhl<)RtG9W~A8BlA*Q}2covK5Nf*!p*C6wwOzqNYGa5;uUGBH zap01KkxfG1x*BAvrqK;$z)$8kp-U3mX8AMoMJP^1B z!pH)mfd#ng4?#P#g@*d@6`%>0zp)^HzQJXpSAepX49_MG#4{&^rxU`nSqRS-u+SW> z#N&yIi9`Z7Ng~>awni*?(I<4I7E7m+Ey)TunS5w0e!Td)6S-%>i?31hnW9=Yj<009 z8%OlrLvr-pQ;5ES5PkO&qVL`y`sUve+D8eg87j9g*>Ki=052*NVv$U!vCQOKYL&&u8)WK#IJT+Ch@YFORo;pN`rw$e3slz~dDt^uAa3!Sv|C#d$^rq<@3Gj+J zp_*Q3W3@Ej^j7jSvPWC4V|*?fPkn!k+@L2N4P?h!4%~1Y2Xe#lLfmkI5I3AC#0@8b zg#*ON#N&nHrw|F;sS+_jl+(~{4SiWS#8oDS`;7zj>IO|VZqxjTeHtgxNW_;rtFVzo z6I!QRiLg6E$*?<92)na{usd4_yK_J_675&!&Lt90H=IW#aOX<|HNE8Qm-ky%!6q_YxuXUMi&C%fPta%Oxy)h2RPVc5yT+|C~+;p8qAap$kB6NcgLN^K_bdwN5H-oy~m|oc87UIzj@V__?+^vM- zu>z);p?}LhSi-ySluOr)!jl^-2=vEx>rK~d;W~;zmLqA z@P2^l5JISDLQ>Ml3|I6VA5Ew|Xs0~nPpMuVZKL1S;$LCocF0>fwy|ZRzU`RDA~5$b zWnhESP4p3~02@52T-e|-AvSnihz*_)VuL3^*upI0)~zaXUg7ll;+l91|O27UFkidQ6T^DE%1$guQlK;T{{Y)9k` zomH6;)uQ(Lrk(PZKgGA#w=Dv#cQ_EOcZJY;PYA8|h0yu{RC_h;VD@j~QG5N6Z;Lk!7 z{6&aDzk>PaxZj8|{XiH!$Audh&+s{JX+6hvVMr}{j++fZ_#8Johk=`e5MA3)w&%Dx zEvfK1ZZ0G;epewnbQ7XOcOg3T5TZkwu;@8%Zb@Fs2=G=s127M9{~R|jM@&grywr1C zq;@zK^mg-;mF6QY3ZLT^uoB?7pc0mD_Z+tnVjR6N5V%DM?Ky5yWk!+3gebDO5Ji>{ zQb?)ixR8-sQhC}x$1R08evVt3NZ^){h|Z$txajObH50Th4MrYI&tWDj~$` zD+tlBrx21Wf`vw1Npk-b6V;q1F#9q}HE!^c**UW9AVEBb$W2b%T)Ux;og>sAh-+R5MgaHLDA$ zW(^_LtO;tI5_ydSmBQlZxU~>rfwcjq3kV|%hz1tu;5lwx%fDVh{(OUrpX1iIWOxqa zKs+}P!gE6*JU0@;b7Qd39Gei2pW`+q61dGIqK&k9jtd=`e~#Ond}u6wv+g-AYCc=2 zmi%+vmc|i%w~`!vhYQhngb;nV7NYMqAo}K?y)(#_fRKaXZMgag^?;wHKz_ zQMqu`PC^{Dvk*t^BE(UnK{+aZjN4TSssDG@9D~|4yxjn%muyAulqbsQL*>39jJ z`xIAD{|RKqgeL;L3P%X_Oh`)lnBhu3#hq-YoZ?R@{S+71GyR8wQz-)*ly0J@Sq0eO zbmhVZX9%&unL=!EmJl194ax@bQ`|WS;%0g-k-(iN5xyyUiaQ@6)k~ke3!;{Kft^A1 z7b=#5@h%}0?*?T#dy2b9!s4g6PLjEoGqLY|0Pj~3swIaE zrD^+?T>KRGfSvfDKe5dtkv2+q4_Ok#ALc-cJR(HFM};W(m=J{?2lG#HPY`2{fiT*? z(LVJu!)Lf<^$hnErxiWJJ&hoIhI@v?z&&dPmwbkM&XNkB;hsk#)4w1@gBOKp@RAS> zUKXOkE5f2@xK|~4DI>sF@iW|O#Qihe>l_8{4U4Z?o#8rAymzBlI$WjKcJIb;k8_t! zrq&tdTG{S=l4IYb@VKR=VVxn<-P-X@s-+>yB8AU`Zy6i(eOn33wtF6Y2Qf|NT_AAp z5!&%MINervyOL6SsuAq|0@}@$$^*L?##eAoCt05N0K9&r}z7oK( zLI}rxLOAvp!f^mt$Z??LepAPSVh16GSCjjTLX#s zt!XLntCRqKYYE}Ewh(^n2;sLbSjcZZ$$jVaC9aPEYQq5bHz$m!i9#uA8(Pkde9jX4 zcWz9IC~jgoptz|7P~1!i#m$9K+(HP&Ex|&HTS;DO|IXngKy?Jb-sXf6RZ%KMbsNjM ztinb^yB?#%fD+u{`^%Xp7a@G$xz*m15r&1p;{w^YON5eDX?(lOB0VLeZ~?A+&GCC z`4Y6Pf*X3wu$7d+q&9cEb3K9e%>czG*NlHV z*0&h>9t%I_#~TjnC;WbF7iWV)@fN6AS5|s+&vJHD?5$tn`OV4p0M)iB8c((FoG&Qe zIIB#1;BgC6krtXw#9iV#QcF2s?02yx_|pd1;`3k6DG zN#Xwt9lF@cC1q?T~3H%zTPVo z;e&OpW5?D{c2^Rsnyo_hUB#j5zgh^dYn0TL5nuVPRm5msr(|edFG+V*tPhyE8!R__ z+1Aw8x*LgzveZ_Kx(RHzm#2t^dlKJFI&5zNmz97V)FA6c}OJJb`UnU+o@D+{& z_bQrBU4=n$`eg5j5@z<=pV0}nEa@t2$A4dFG0*v^H5F>sn#E72>G2-W7 zq0_z~9y#qxjsy1D?7vcAlv`C#P;Pydu!zP;(k+{RbSeBoL`$~ahThRh;T|Z>`Ay+< zW95tRx0%i1ZD3LD;pyB)w%HwCXBXW~RwUR{Cz=u~Dx-bX?RQEqrAtvE6WGAMUVE;@ zjGF5uOE#u?>hcS)y>kAJR(Fm5wzcgp_X)dEozQlN`9Hp^e57U7$He5;0%Z0K9dql4cVC(*N! zZ;JLT-T+6 zd0e{D-@g?s?B`)dpE5`%YwIFbws#Lc)FXGeuY97sCYxO9hBq;1fTHkN&k!lJj6tZ@5aStnbvP)0MPHcCwO+drYCL^M)?>ohC2mR2}Ns2bR zP}E#XpIw@x&33?%>CVWAiE>uv6k2e=;KBX1-BM!U;6$BkE;i;Uz1ToIVB;Wt*WKJS zsjePBMHX#qX&hJI=8F=;latjXhYTDtw159ZpTuwqBtD?n^dqB*o|Xpny#Bt$*fXuQ zU_Yejqr~<}k#xfp6pJ>8l6IZ=?!e4#d)cOYF@yBKZz=qNuS2jRW;QOB+)$K$cAwp@ zr`%A?p)zLop~?G~OLS{QTa72p?dQh>Np+Ht_E@%#DP) zb?wgI%tVjl^H_H3o>#f3dp;p`&o89z1%%YSAn5Dn26rI|3s=P~jDY)&MS#F9N?1%` zG3Bq!h+)yg^5T|%37_9Tv@U582rb2d2rVsy&@w^@Eh~i3a-eP&O)oetPdwTaCc$yw zRv?6jFSn;fD0f8;RPIVb%3WDVxw@NCxxGM@D{i`(F9+jUuHHlfx2igoVBm z;lR#(4q*s+VILy z=d&$1=FMS3G3-mv_+QJnsp!HR_l{e>+X~BJTDd3R%%XXu;bvAmG(yREXlo%J+D3?n zwiV)`?LalN`PJ}8N|^eeFZAiM_773h@x>?%N2jX-cnh77CY=c#q;?)ZMYnrE-oZ}M z3m57Id(aD_XCJ#kYyXwCL|ML@L|Hq2?%MnhJ!=&|yXbDV@b?G*4YtzHS6qx@Qd}zX zZ~V^ind(nINBt$wPHsp1K%XjoG1J8A@s=`EDLvO;T18l+sFu(pVvs#tETRCxlWx7*onf z*vXGMj3+NGy8+%QS z9cZT<myVd8U%nL(xn~skx<+CzPJ63FnjC!LXt=mL9dI8f9AJH07c-9wMYQ z9x9|Y9wwwU9uBHCCUhrs1d({uK9UGqCP>7{vT|p2cSmyuykxq3FNuckW2`uM9jjz` z9Vdj>@j`f=AcWV6V9e_z2~#t{;bcz0XPl@FKs~XBC3Or zbjtfF8qF>?E~s^hl2PkYA!=PFM6Jt(sC5M>KiQVdS4x=ryA-&J+HmsKK;W(+RJRVb zl0`f2*4Nr8*ZEWIBLbb9oGm@2TG}msLbmi7r8{;w3G1$h7mg|2v2QTaIOay>!Z9}q zam>v^9CM2h$NUSFV{E(PTZzOS`!*thyIrENV|Pk>cL!&{OUBDLn5bjlX~n_oE+xb3 zZXvwx5yI}7GPKAe6AKP>SMIHMQEALTXp6}R? zSp)U{tQHYoO@l2Pm>A&R{$M6p+dDE2BSPpzm+!)p?z{yr66r#>A01`xP63Dvnn zy=2vnJNH|5%G>^w>g%xiO#Q0yhkwcF_}7a+@{5Ig2Lw^h^E2yyVDLL9u9 z5C<;~%E7h|?-E4fk!49DeCS0YTJ{Q^v5;Gu+;Ea{^NlVVPL{Ev;Iyog;k29(PRk47 zln}yc1u*8+Q$qi)^$b1aRwOg+VI?4ND-(8}`YNiYG9#^v2991PI{pIQnxOxB-OX_)q(W-avRkT*~Ji8I2x;j5PWW zRx5yl4d3!is{^mP&@xRzf%p7s6?T5KdczF{f=L?Cdx6wk0#oVLO2L z+TNGtN01#Xf+E@{L5l1sM3J3@D6+E)qxW-BN z&-;d69kggN^+4bbu7DcR@pp2i9a0~6a^xCFI^BL_rt6a3}CL!%QC!}3FA?>;uRJ-0NTHDluARahd ziLm33L=2oj+yLApVpOjtlJ8d0_&C|lp!z9FruyB5RKJIi>h}~I+1rU{{S2&mD{ zw1e59#N&5)40%DV=@KEFE)~M*G9jEU2i26VO+f1k;&D^Hk_ek3 zOGHynV4E3!eeP;9Q=BNZZ(`S2NwB(B$*{Uk2&?Obu)0AAs~bUCYAspnCJ8(F@w=PJ zi`{Mkc#(}zb_+R4nAq?*p!tfqYb~8mGc`xzU zZub#k=OKx(o7z;*=n4{FIotyzQ-Dacx734nE<7GmGCUp@!s8JkJRTLo<1tW{T1S?8 zTteTbN>um+so3U8fG@Wb$~GYjF)p&r)0XQQpUd0kS&P8wIS$0>c_Ex$5W?w2A)HVA)m80>u@a32uLU?CytVFuIgFvZ^?`nTo((C4q-1QogDPxn&a zv&|(w`o>=IrQLl*k&#*BSB<0L`(vvQTYREi*y2+mw)jklEj|}wi!VUgVtv`-O9@kd zCCRTS5u<$#@Lh6387*Wk%b3x0V_9spZ!Q0KK7ai2rqaX6_m&G)f8ao>{wPG%pM&_@B|w-+c{%)%LT(Z zI1s}*g)p2;2*a*I7&a2zR`XSuvO{aI z(x5d&h);$J(Q$PlG}izNO}?h&{-!>%sjEbW;%fm+brC|uTCu2E+s}lXldWS})-A|V zz%AOGY&}bc+xi@c+b|*AHW0#XLm}KY0t>lqOg!G4Y!f1Z+f*XV!mkz4I|gnuWO|`? zb4#P1EhM0xErryxm5_Rd3#n%WsOzKHtKV-e^!rqY&B<+p2or1z1a3RR$ONK+2^c^9 z_lBY^$wpevQ9fshEugAM5y|Z>2PAip0Fv6fOC)y`LUJb|BzFc2N$w(fsV$&JlK|CS z0cLp!BdVfQit28bGwE}--2$oxv3S;6GCWffz%wm`=U5>;#|hzC2Nv?Im%QB;P#L6< z91pO2E@4DcWC}?ZZvi#I@;4Ub&v)W@3#hCmL$!$mQOyaV>V!~j7DBZJENow`#N&I$ ziA4B*lSH&H-7{{=)dw!I<50GY`;r7|O{_#Pj9uE}y8 z=yO$niUoGew%SHE*_sx1_hub6?`%%+yVN9WvV5sYujkaZI(r=cWIlp*@d4aT?!|0ILrP)%Zdq zA3)SMzUYHZmg^Xw%dSYiCl>D8bgZS~gX1`m4~`e&gA;`K;6x!lI0-Bq4NfK=ztMII z5tb54#Aq;<+q^&XN`GO?(<|Cqq3yq2mdLkLmu}|O<>unIU-@k~yd*{My+v;u^s%u? z_kRA3*swh9oNuq=YNx00RLU%VBR1RA!e`Ht4aG0@w*T3>xh~tEdrH+cEun-h@S&qMwIKE3 zzbt;bwMW|a8Ises&lJ+O&l1wM&lb|Q&jB^QET-F=bBV-L#^(`XMoS_ZcK&tP3y@H+ z+I_y>XukMD%TB!)DVcgN7EOii!SuH?Yw-GIP#C!7Jv9xAaiBc+OlfHEs!ZeM^O0_L#@l;_nsP@Yc+ z<@tqBUO))t1wjn~ra9(YhJ@m@kaUJlCRb|2fDNIYb$ zN+fWrNfZtlr48l!kOd+#Y`*D5Lq=aaA0ib>hDbjlMEVOMGC&BCfnZEzkc587=%CWU zj0Wjpqc%%+mqW6s^}tnXTARCz;m}FxmW0FmTm}FBSCfQ7g zNj3-NMcV*n3kg&I4a#o`Q(DtjK;VWGYB&ikB2Ts-PG+!hY=o7xwJ)jq)53*gBd0Xh zCKAK5sdS~y#+40gmc$E2ur+lVUj}Y&$~LlJ+$J{BS6Rk~`qJ@i1XE~!dLW$P(5^P| zv|ej{D$%LgJRb5}$=qDIbI*}2j%m7{ed2>eMMXs-j*d?BO>7lT8&*|qzENk3k0)L# z6C+wD)UZKy-^3_Q9Y&Ll1yeJ{lZSBIcye-rb}5WZ5v^(~D0Hx2LFTnc>>MvY>os8D zApQmp8r;JFvHax*rE&XN{b~9&JE(PFvGw>oR%6icCaIftS&cjP*Dk! zD7<#k;2|yifrEy$OqvvxFuE*o+u(V6Q|U>DZLL|*o3>LfdecZDy=jz?-c%)|H*F89 zH}#3urtN?r9-#HZLg03kh#^KlV?~P--A)LpUac_SnWG_jXFG%HcTqCcj}}t>u0pCG zBc%G>KwmwBTT;R{Ytw3w(QRshz@-S=5lQQ;%8aNM4ZCCQlyUwPKkU|71X}eRh*m}j zt?@!=H3*?K0o1T-+QF=mc>E(nmPp{5B*G{wV3Zm5H}k0IpR0NS z^Lp`U;r1f2Lw)wPGtp-steec99UXT`a_Gmk2T2rJ&5#Q?2ka2~&TX+2s_2QLX^^ zJ|m%w64I3oii~oV<+|GEs$LkQl(;y%Ye?@<*=y}&l)X;5Q1*Hu%HAME*&Br@dlM*S z?Iru0B}{c#<1Hkk#J>P0nF*ytNJE^x65$Hc+bq}ZK9|4X++h(&-N}JS-6e$7-9kv+ zBZSnwpe{Iefxrp(5sxo8_Y(=+0}_RgNd--YTa@Vb#63tB3K5a^SDA5k{sCRDIjo96Us&*6EQEc(KD9oS)a?>=sAnP z>v;~u>jfdaUKGOXB_X_C24y2t4{EOvkDi5I($XMS+5Rm z#oX)E2O%ld-rjE*8T5Kn$>{Z#5WU_OqSre@^m-SRy~}0q_asdHZ5q5!bvW+>AaMUC zl=DKhWK(lq`_-8rTKdslRK^ReZ^4xex!JA5j{4xb6J!{Trm8e12OzT z2*V$RF#Jgf!=FJh>?=?GB4K`^;jcsk_ZwlvP!)kJpsI>R2EShUWt z3_-ZgaBdC*H;)xva-HG4mQ=XTa6Tlm<@`c)SU`vl3kuO;At5>}EG$}QxQHY#Wds;M zUT3%{alg)RF^&SaxW(73u1C=}>kLD+!yoWiW~kL9>kR1MzmGl(mUhkQb!>;GK3dx1 zTEfq%rW;e?Q8bYqB{-LLcHG-7L9KX91}R*YxTKLm-KCVUNV{c;OCzRPF9QT_SwdTu zxSTR$ljVijBq78mD+np%qv6tnBRJqb1)mw-IR~4e+YC=f%0So=pS8~4~FRG;i5nA^H0@t4q8rI-N%wH$M zHHiZ(%fNyx1=ON7iGwT|YJ)itwIM>N4HZIdbs^N&01K(DNjzSYSV<&sYe^IuC2S{d zZDjhPdL2uno^>Ulp7n&(v%Zjeh6$->15j5evDXl>p|E&O;zo!t!Nvfek|c~wAR3sU z-I~NrE$3!FXEi@ZbctK9+Z?F~Zeghq+)@GvZY6}^a3KUo2qCyNSV(Xi$^Dl{^QCT! z5Q^IYycJ6rQ52O@6h~RkDxcGqO&0Ykw>>GMxr60^X0-&++))V4orKWbSqRNtz(Sg% zCHKoFi%Z^>1gMSy0=FAsL{*eZQB7LT8lSV8fwxP($Gcj@;+e8!c%~(Q=U5>;#|hzC zCxmA`SjaOYxnDL}Q0#c5kZb^WqmVEnDKe!wxo2;6am5lN9LBw4&p_IS&G zLP7qyISz;8gZ1tKR8O>IsGg)WsGcl@>M25~o+^auX<*@)cRKO-iQ)_*fjd(o#=IeP z1N+oxIOjVy-BPQMeEMOVuN5{h8{FKS)F%oHSAABvvnYY_PRvkIc?TaY@2VVjN?ovXmmURdL`g0Y*LTK$(=ZMC1Tufi&1{a>6Z$+Bpd z_TQtVuw<>vQb)Y~eR5*5zJV{{HPp9EN$k$A2F==Exmh<%w1{!(EIXhz@x2ftwqUWA zwZUmu){ynfY@6Fx7=9`<-B|0UG{N70%XQesBm46Ckcd|zOlEOoS-P>gRX-fCU@>WH zkogd%t>tc!ZBkkinBbEogu1b%K)##lwe7_R2GT8)vTl5Zy8_$Ctu)i78C_|Pp&4DJ zTr{Jrg*2mUgfydTg*2nFtStSzJ$eJCrvu&y1nwq6b->Wg>Tg9I z@Mg<(i_c~2{oC&~UYl)faoL7M9V>C$^pBQS*GS9K%5<9lBsIjWOQrcu+P-TP{)ogX zb1k5+bpN8B4jbF8MuNt6n{v_EZWq$n?hw-0?iAA4?gG`=dPG0V+^vMvEN6cY)nM3r z0Tw?J%CMnIvZFU_IN^1_<$A#9vio>{A&9z|UQX0C>p{zb)(>$YtsfSm^&>*GepHCo zkAa2PtjCGR*Q_Uq1nx<37j?~!_!t3w4YHjw4W71`#B-BpBF;=1yIhi6_YPYnEH$Oy+mQS z<7FUluMo-|A!*s8sGYxRxnA?RsyCmJfkLxjpwLtWdmM*%*|t<%AK!MbQ)-8Xdc&&3 zP;V+1hI&hgq23l^sCR@I>RnKVn$KpsBuxFqJm05K4E6!Qd={Y$7Lu2JiVXIl<@(6y zs$Ls|ZNv4LHsrFcCYQD>0&F@WLxTDQ)%REYpWk9y+d35XjNmY zpOgz*{Vc>*zX-9_uR?6~8z@^XBwPJ1VQLof?J|!Ua5f-tvlGgIp%SuJkpbthTyy$d z)gv(AR=Qua!HF*oYncMK(eY(QH+B9Seq-xv6S>x8V~g&%TAQO6oBYd9O?;M^8}ziR zaC1>~ht}(A^I%p+lHR*;>Sl4*PM0fC#JP^Jqt zkfqFYJPAcB`WLW_3;K)&SCzu|gBG$>bX=GN>9~jx9Tyd%<6=T|TpUElc+zkQ;_(vy zC5f=-HC3=WA~1A*$KS5qbWywb%2lAwf#z8 z|Ngx@C|}pJe3L2lKo-~h|L^sn|B82kmZo{pSJkTXw;0h&8OvDPqa81+WZLm^LfY~2 zLfUacNIPBuRA05NS$h(Rm*}iWBycN9L?h0>3$!v4>Qx)h*BhSy8xjfJMiOD;O&QQjy$e+Exuebw3vOdoSD6v>yqBWZv58d( z`AwA!`OSoo-&_d!ErgKY5|o#g67#Ky#I0jEk-&|R2=-1aU8fbp=b@jZZkdRyRn>2@uHYF zYV@nJRd1p zJCV3Q>_H@OdrE{~6P?h+1!RVjY>;<@?N`7D0`}IFK5L3sK_;A!-~c zM2(|B^%=7U#yy&N)Mt+2IB>@jilQc!|4<`v$58@Rh-Tj4QNKCfiihb5N`~o)LYST; zgz3pbn4SX020v9oKjZtyIGsiTc;R#)aAy#z?}S99cgKC_OgrT)f69N?8)Iif8b_4w zjOUm}IO1I8!V%{Qam4vT9C3jVM_dTX5w^JOA|i2TyqHMfE|G`^Go3faE+q>@WXgPt zh`Qiqc0NQdS29Gd5JKciAw;ecLgZ>NCUT90(|u#?T5{m>>wv&rPdEdTH>kwQjFc+s zZZ}#1H~9j5ce~jlP`-r&QT~?@%C`!ke47x;w}a|#ra9g14&qUFyOZO<-9;#3|HwDS z?uH!fWr4ikqMm$@F~~2R*c0%@y`{&8CrugL`;>Cw-lv7Q z_ZcDXeO8Ejp9AGyd$f6;NIX8gKqPQ4N)(O{rLE##A`3)h#e6%9#)p^fe2BcFWQe>f zgve_`h`cU@$QxixLrn{l68W|97BVwz6*YzL)Tyw`2GZ(4w9E2n6mYLX8Tc`tnix zQDFuze*J7E{o+fqPZ2~fHuEh0tR{*5&~!uP)`8Q*uA7sU6o3Gw~x zLVQ05DBs6#F3pJ`9y{hD61c7s(fW(tTSe}!_0ee2-Oix;9?C`aWkRZ-TS)cu z2&sNv&{t2>n@_?vZ!XP`48Jb`1a3jXc0?A^S(O=4EgBIPwo?}Ir}zprRFm5>tq)O4w8#L<6%Uf+Q zPbeAYD+poUQwZ}Fg)mOx`O|FB@Vc&}XQU(Pwob`m7;DpEZT(Qwhe+d@Ukz4_liEYa=B>8@(mgRvWi2 ziBOQv!Z0BeHV{H#Lm?D40%HmrOX%McYggSSq~YXE0lq{+*deja zRZ3+>Dirm+E$q}S{i)vbTUi8}!#NPm5khEgErjMaLTGLa%JZfzp5KmmbS)mqao|P~ ziqaO?>MwM36~$7oxaX}Lb-(ScPU!ETWaw+Tp6Kr=g#J!K=XM$}0{VHifIh>SMGNT1BM2AJH*m;eP%FFS z0{TWvdZJ*X-YgP1tVxIxIU!0oAxbn0QKCgyw1B=PqpmOnx-^p9U{aXhYHd0Fd;M#2MeuzgyjAfA+F{~WGH?V5V)fW zA>tb_$9`Z6*TWxUS&l8pQot=*4}Y8`!|iwu#O(wj+)fn2?Ia=GP6i9PokBcb4}U6= zz?~)$W+~jG_jF|XvE~d*qn& zy^rETuR#XEYXP>bBa8@&NGXEXTh1GN&bBL#Z$vDLH(4?iZIlDAuNdQ42nL?7qD~|8B{Pz^(&v)H;XWn})8LIbjAgcEZq56Oj zst*dG`Vd&ysvagD-+Demgh>&JXjSF9TWGCmu66aS9^@zNs7v^jq^#mhM*Ch?xW_n& zMkKPcZol4$fO}lk~q<$;Z2kYRfv|~y<#~~;Z+W#!fQfQcwLAJZwOK0 zO|Z~`ZxN5~VBY4KX%0g9ZwdUjbt60ZYJsgS3r@xln(kdP;V;qSex!{(-?I`R^S+WH z^MMdD{}w{#Lm^~70%gxRG;n+@VQTu-enK8>_bCv#&j@9^kc-%x?X)gCyvzUGGJfGR z7MQPaoynJ$3fr$Z5ZkYXu>D2|+i!)i{SGWN-S@=fpO1ea61X2F!giOj0=&&Wv>S%I zAKSLF<*YEXHP5}ZnwizjwRP4*{EF^q*-*h=u*32X^x*>j&TskJxhXm-gxPoII1az8t0lukASWIDl z<*&?$p&xp}6&wp#{sn!0`VLpLg)9Q0g*gzRMT8JqR0yHPgb-RB)D_M2qHixjJibgU zNrWX?5@CzU3^Vaci@&*(xTPThO{tnUfAm+glM}0DD!vK zFxFGT)PGj372$x#R|0qyln_H_LS1G3qD#ywmaCV~<^5c45j5}3fiz!Lh~}#a(Y%ik z&HIA#vl$TOD~Lx|lYSiY1}LH2yen?*TzCGX!;c$4RdA6$?VUN$c%afCC8N?{Au0_K zqS8^9pu-fCR|ntu)K*-E($ZOgxo&+nbL zu0_yvJr1Pl`a(1vCPdQ>glM`USm?Zsh)2^{8*|LNtAuji1voGKS?13U?z6THl(|iz zOe2t8@{J%G$Tu^6FwN#l#xz?9G0m1jOtX~`(+mgW0d)kCcp%@J2>WtLgkki}s=vlC zZd;0kxD1~s9$g8xv-%)DQppe>C4_jD5aQblA-)3`6R(!gf3xZ@BDo_a(n@y%0=F~a zUu=Y3#JDmeBNttZMq7ou`U-tBA7c?rvKt37Nm7VOYJ`}iR)|SbpqjZ^mOh;(9*t3B zIS$-7LMie$j8Sz|1sCa)_i}W>sW%>|luC1kMp+v`naxEE$hcheexUbTGFUjWW$vQj0ICntPz=w~ER#?O^CyNx@pB@5(0H zX;^ELa$&8>Laa4Kh_!YXVy!(uS!=%NJ*zzt#2q>y!idl?(XjH?(Xhh+}+)IKi54wD>)}kTHty3 zzQ5=EG1tyLcHQ^Lo}HbU-3uYbi)C6_p-b*#ZgH3;Iov1l-Qo!IKlh)l zjs?{%Ogoqzhd*?S*c5!Sf+_eEAqAf*q~Ozp z6nr`;d)VQ?XGmB~i#QWMwm1uj+}XHlVsW`*Ro=w%^Tg*^!gGB>EK)X4e4YhC=X@?i z?*bvTFBC%iA|W&{2Ge=sOYm`)7H&9aWt4wb>vEcSdQB5wM#9`Q@#P5OY2qumjNFx$ zb;W7ot1KuxO?)*Hne-YVI$SG6hwFssaJ>*6ZV=|CiEor-TuDG3B-6w<;rG+TH**!a zTg*S8ZVjrw!!&WMb}~yG?}13Ciz^(Uax2+U71A_2XMCHLf*!XkVEVE-<2w-3814ij zcNebB8Q-nQD0`0(W$zWD?0rHqsdRu!Tv_gZ#VMaMegJVYW&9u>PU4b?#;>{2kosYz zt}V$#9cGLlvDlD$RAG>MOi0Zu$Vvkn0B8FQ_ud4ik}D($)7C-B!7_rlD`Te`I``uzY8Jx2bd-K zr{tB+(wJl>qdFWbJMJ7u!KeIiv#h)b;KOJC_neACE7^<^zA*!W^$^NBFQthub=;VQAwp4wm36Q%xLg9Vggv=LTdfjcRUeYb0Pd`x;(N)#?;y zhj9#RZ(;&Gjt#wd1khTl^iT~B?yy5Ovur$E3A6#{YxU$steP@W@=JdB%%lcS$PxnJasL${= zXE}>OeJ;<1>T?Al^*KODebx%8&lSP!ptTbI@F#v{t|PY!uEwlQ7_$b31AcUff~#+C zWxsNKTuW;MUv8vbXY@(4r>b0VJ#s#tPQG7POU!!>quDqN7$}Q*3{H`0H2`6 zRZYbz$W~TUnUQM)i@2eWShocBp;sB z(`>9*m}V0prrA`8X*LsLn$1C(W}5KiI!FP<2_-X_RA{~hz;|tNrFqOyTIL4qtt?iZ zk5$*4xz#1ZA1C+MGdMN1w&;t4otz6pe;UR3rUNJZ;OkFT7}_|BZ+L3pt?I;dTT^tW zrrXANVY+P<3)5{U#B|#WG2ISAOt&K_(^Uo2?WBO>e?y^qO2+&{06y1?EAz)%%G%!i z@q}*CVm0_!nIR(k#&Vd2Vuayb$Ot2Z7@<*!5lTXgurrt)9-8ncZ!AaRiCnWpj1PVP z%Fg)ksmyR6j&GAX%c`a-_GCY)*N4sVeTpsIwHx{r8;7>_(RU~E+vDT0O8rbVc;Y@kvmx;Y`iApeeyPz*4fjqQ|MJ; z-~0GFy*ouk)t1CMt)b8|PPM`yewu&t*P#t@P|Kz zH*?MO9d#5@h%}0?*?U2 zn*+W_!s5h`xtEmK`aU3X_v4~eDP|~5&7_(wN?u5WHxCb3k_UYfJIJg1x2aBUP3|Fb z!!(uK{KHlhrg=oMFwLVvO!Jr!(>yN3G*5ssjhzkkB%Y+rKZS?G(IleodQo@X=Iov! z72KqDT5X{tJZo9P?KuU*?Rg>GUJ%0VMIqc?0uyd8OIVyh9^*(vjlBYJ*ctAGtMZ!4 ztu4tKxi0g%<@tus(|4IS&4XfZaUsRt7NXcYLKJ&fh+^-7>M~{@y3G6dLznr0>&ShG zE3R{4_Rbo>N5ml$5lM|4`o_nW0bD*&FkC(r!sRm|Ts{}VdQ31TYZ-gzhZ){=bZlhmE7p})HyIvwvns(}%WU{VXPKSr$jyN(Vzwc*Y~|vAukFkU zFNjO|w8}yUoy$n0|J({j|9OPyKd%t|=M$p;{Gh6AHvN}cK*D%K>c2?S1))VdSqO++ z0at@UtiI}~^Fd)@OH%EV)Sbhi5U(BS_^h(}ggl@8lS4w4TLiY$YvnOvQB#F_T}-j4 z*Tsd@YY!py+EYlq_5xL}_8hVVo@7i|5>MoMOB9a@m2KjdA__!g!?b~gF`>rNL!^&_ zA<|a}k$ysmEG>k{GGIcazl7u6q`oXMsO#l`$SsfC1<4hZV{J)F<;H{omO-u0z>f(l zng_}&aUsep3!%J<5X!3xp}ZQXF~KyaTda;hj0tOS9l14eMeGn-)W4?bxV2yfZKZUiaX$UuOj!f-Vn#LBCF z%EyB)HmGl6Ic@55s{5KsO*W|8mkRYA(n6u^)1*lJw@LLDXjpsm&^C?$kB?Pkx=6y7 zrlyuLnk?k#<&pJmIzpT+dG;YwzF?|RXxsQhpuG!xYP7zsy|tPvd)qQtr?ggY?>}_f z(%v?zy^ZN3@+%Y@M)E0CX1&{ZWv6mNp7sVN^S;Lh@la4dzFx{yID6mwEwlV`1D0KO zh2;heShjz^{(bvZGfj*3G@fGaA3%7>-P}w=;~At_G@iji8qXF&8qbzO8qZds8qcC( zrc(QClc8s8JdxW*B05iQdD6BBDPA>^w%st;Y-cGbetQK|{0>5j-%&{MI|(Vi9`wc2 zc85sVVR_O}WHg;3z-ei?WkiN4Rc%RBa|6n7OESVI@dHYud7xF|LbP@kLaRv#t&u`# zHG>*ZOgosh;7?x1j>5zDF(kq$i_rMG(dL{ZJ~@h2YOm1OTP-t)wJ8{4?Lvr+7D8-{ z5MsN6vX_0&a;${KZZp`8=$LYMfCI{K)eB=<(#cyd{z7MDvG(+_>Xt*viR&|NFS6)V z@4YR5^xj9Y(0gAYdhaJh@BM}7eE=xE7t$DapoGQ0Lh2xLz!V1qEPBJ0DPpG5+?yhP zZ+57~I?TuN4e4<6!21X;#QR7gypIyX`)DD&j{((?tlFV|EdFq3I*x0;-hr!jv@j;_ za%gcU5S#2osk{}PXj#GPBn89jWFf3h5yI+JA*@aVWzB_U&C@0HUwQ4i{4uJo~d3%klZXmB+b z(%>2)8eA(xgX@H7a6Oo9VK?9pE$l|FBX<+7TG)bWVdKB2+)PxADn8}S>lVugO1CN) zO1BB2bh{8rcLWL zlVj|;>36vdvr5Y_pCDas8RnA+;$@gmamnnO(Y<}((QU55EA5?TE@Au2pCM1>cG zsPLi?6GSlVZOo@6J+KeU|$PnWl3hYeynvoWg9QKtZ#1{ zp*O3sx2>&d<$mK`m-!m`Q#DdOyDsx}D;CAxP(W4Ly398b(@fq1BKJ0~t;>8zk=z--eig#(H!#cWcl^ns%s=o%?oWv@2}d1;S2uoD;Uu$= z2k)OI1#K>BG6^Vbav_CHA*8S=g%mawsDVr>Xf&Q$@?v?$(;&wf(*lvJ!VSg{A&gPB zJaamWIlYf*>mPGX)y+VNn9gW1Fw0C5z;tFIOlJ|obXFluX9KfLXP4Zsf6V7R2LVu> z6NubgxPhuDRiZk##hk~-v{#PSjoiFQL~%X~f#UoUKyd*f6c-diaUmfT3t*Pw!jk(J zj6TO|1W;Q9;B0T)Kur`XQCrMnF79JiSVh`{5K-)DF`(E>0w^vagyNDyDE1aYaVaoM zu}1Prt4RA00M))ge3c-86UIbD$@Rl#dBE;hUan;z;k&aJXa9HbAS+@ zwP2R#ijtSDB3%h7Bv%Gl_JkWqicFSdeiiAe7Js!&{B$@>R*|l5!BAa;3sGHD2-UTO zP+eOH)pfvZe_a=U^4PK-9+nP;zwMScuM>2+?^{Av$jcqI0^CbaMsx zqmR2(a1e2+wZTB-w!p_QP-t(>g=lXhg!Z;V zXm2Nk_V!@5s&>GiycOROPvmxzh^l&*r3W3h^Jm_T7dlzM(fONIZ}4nQ+e#UmVT~Oo zOvC%w_~1UjjHKhBh+u5r2$L(;vxt zTK!?D(N6m?aOUzTFPk-k2uJZ1xki1NjdJ-!9P3&$%@$!UljLi238M~+E%S@SL@&h5 z@+qHZE7!KN0`LMT`JF!h0L#uoB z&SzDx4@@OZ2t8P`&AP4O4ea8xYSQ{=XD3%umVH#Mo-;3ERz{IZ_-!C6)P`n5fu4*)Wy{_tpEas-=`rgpkTx=MoMWGE%V^J*kUNua6_R6%+ zT&Oc^&>?6sK!cXx76foZX&naSLK(mb*>KX63+v+yM z!*_f?3=_IT>}J4?WvGI=u@r^eSQ>=fScVC?u?z=wKeV}>5qOfx+(tZ+D@nv%C0)<9 zGZMBl+7s0OHq(peiM{ZL^=x}{ z9l3pQ;osC>mu&nX9k$({QUJdrz8B5b@V8yn(b zG`j#b*Y(o7L3Y3$&mCbR@6F+!Hlg?9iM|K_mHX~^?zQeP*}b-;DomSe=q87o<*CIZ z6ih81DWn#U5>kst3#r9pKsDDYRpGICl5TPw9;Rg_q6!yEpKCj-LU#gjVWhfG8HEmX zqGbf5lN1c2lZ7xkMF^u)g)lk|OcM7O$4vFKK}3+YyO2{7IEkTawDTo61v`)zdyJe^YtJ zJgD(37gFOnA!U={;b-pR2I^P1-DreCB=WPj#|Esu8=Q;kC zihBnu)1Ti3BKIDyZdGw@st0v`t9sv(eBhJRUC-DxLDM7?JvGw#bjZX^fw&J*fR1Zmy0FnC@ccK*fO{H^o z7LdCQ{BGI);j{I(fj`ZIdXvmb8q}LqhP-RaHegm_=$I0JxD8Cjb>ybT z72N}||G%Tj$5Q4&ks2W{#^4i7*`zs zZCgf`gBQf5d|HuV^jO|VqyGvDM*jgq^sg17|B6ENUkOx2+Q*w$mhj)VWn>j-(PUNy zBDWf@hLBi&)lug|$m*744WFd$N;*hxdql-|1OJ*W0GwOy)`U8hTzLdp%k-j>*H$bl zc^x5@ysnT+UQb9RuMet{ZQg$aJjn>MA)d%>BvCwqbZH!YU zU^s0mgwtk1IBhP3(;zV6G+07Ef^=Q}7DT2wYzaheE8Ol=uTwd-C25@-LAJKMw()uS z5oBBQpvZPyNRjP@D6)ePMRpXT$WEX}5VHp(NIm{Af(+rBlQnRY5oAK%HvOZwry5s; z7sRD}T9IJ{X)x00KTN^sKU|3ZBZTPRC`A7fsEV}Z*E>u2@B0d36SQbDBLNN;!PN*7 ztFJmLA3?ge}i-{xGrX-aa5s zT3zcS>Sbp&k95_w%lZf=(9B6|Hi}6{j@?lK5F)7BRoC|IT|EXjO5PtwnLKi9Jm5iU zL`s~A)YLG#fwHSPe$8d&@!Kk&EO@M#sEWN8)CrAx%iN#p@CwLTh0&;66^lmQCZtif z3u)A&g*56hpc?hkVe8AT2$E5AES|{iCK01%ZtKhL2q|9eBkfaRaNNUEP<*6dir-U6 z@p}m=es3Yg?*sbc8Bq3>u*24u{gBb1_Xi?(0B#wP1C^?_B&xZg?jTEYuutNLxO{-!Q5;AEj_^<3n^$z^|VsL zKzE!mM*HIxjP@r8(f&js+Mgsu`;$Rc%A$JEIz__bze~+i;Y6c24d4@6xEkeR-Bmlj z9mLx%&ahZ#`dGRzmVH36YIk=Q@=gtRwxz{z=O`A2J6DL|&J$v|^Mx4h0#JstZ!BLZ zVX?CUFCr8bE(RiZ39eL#S%|S$A>Mp*sl~d?$MQ}2a`V9H3NFOyN+F!C62j?fA)KxO z)s(GGP@mW0Pnz;|c=+6wL^S0Bwy8K~R;S~oyMf4LCraf_>_*E8RyQdaRyPY_b&C*I zw+dl(8z@WlQWLvfLO&_rW$||q7rWgFa3C?R>=tv9HaWZ9ZL#k0vAo^xH4hB$<3bGY z7sBuXAq*cB!tfzbb~8mG`7r*(Zja!J+@lg5oLV?c_ifx_;BKHEWY!kB(+2y@5ac6MU2F$i0Ot)68p4sI3m0nxs zw{U%C@jv(R?b8$7?5oFjldtY@bFU8far-Y2Jnjp!3J%xe$ODhjUe5F_z;%gy> z_(q5!z7=AK??4%%Ms4ML3H_%h{w9(?kRwL>5s2JRxH4MIT$VAT>HlQjXg^#0Uwr&J z{y|O>p=#v;K{T>{Zojllg#E-U0SM6iU(CKYY0w;moGixstJYy zMWYjjQ&@s2J0!3Xv#c_vvRE*jnhPjqBR9WgUU6gB0v7aC<}<7dB9S#05~4*xh!zVA z(V|+27K;dT8@m>jWL!yr`IC)Zi{bYhyB6mvay`sHpw6Lcen(WQc-%c((;Zyd53wR` zX>M*9+7@s2DmJ#}1+F3Q*W=O3>u_jiLoe5p;;B4YCcE#em$5?cB^1!3Y~R6TWk@~vOXAWpV^^~b{up+t14X|v74 zEvNK+^hvPVh&So~v(V?XOmTUO53v;#2C)G`YO_{|mMaP&x)PYJtd%7%b|_~Rgy_C1 z!0Z?U`4LJHbcNI{zkDQI(0w^h;CpfN}oe<#&{ zy0Fy^Muri#060h%HyA-gFap-sNz!cC=mD?|bSsNl=VN+;@d;CIYlI@WjRit*TL~bz zoe+ZC3n93J5P~~`S%N!B9uo|i)+2-95P%6G+(1x7DiJJN%myE`<3^=nh(&R@1w(O! z1W;@gLa`)-;?6=SHi21+BPB1}sML%Uk}W{wM&SmMB2$UvE*8`In0`B6rtiB}0z|XT zB0#fU0%(pFLUW7|n!5_2ITp;)+)eU$pIo^u; zk`BX?+nX?P-N)jct9!>Lo&`UMhs@WkRT4 z4rWKdEAS`JLRaF6+*J}W0&1!7pzJ4yD}0;bYT`1?i6cAewj;$qu%j-yi@R%7PP(b? zT4RdV*GZ1n*9+151|eGCC`9XlLb)pjcox!Z8DO)1t}2BYTE z4>a6vvF`A(>b}PwgGV&7gC?BKGqj$WLBFlYf0;mQxrVw1cJ(k5T4)*7&|Db2=B5R< znC;xqra;!xR&l%ExP3^W>^lfHc{-$FIP zGY^SXRZ4vb@@sePqY3_#5B32GE$C%a4oBBJ?R-nq#@~FX>Ud)Nome1g7o`r>c9)rl zYP(ypsJ45ARNK8ms_i}@)pkFqYD+$_@PGn}{}0>sK@31+d+5mLf%jA@%hPsQOAy*nd_5U3`W5IpUzw z^8iyFxKb(RBMrPt@qz9yTCA6REc?gkho0=7)t4<4y5qPI-B*OreN_nE*M!i09n6k} zZ{SaMzPyQt$q$Jb3!mW;uG2lM6%Jfamp5nD!mFcYdmS4^J6qVCyn)b*it?Q&^_}hA z)F-5Qqf+l&edjyna+%xs6qZ0}hn}t(D(oP!p$(0rHKwGWg0W9pWOQOXUYBn_yIURu zpygHIB}#J}`~3XhC%;c6457KrMzT)$jYkpofF@s{2~T=DDa{YB;WINsn_Ak7RaNPq ztlC1)zfx*Ez^D27?}5m8@qiwenEX#d)4x<=swLYeUBgnb0c{h2-AVEVySHiG^m=tF z=Ir88I=pv!$C^If=v@WVjouT|joug1jXn_4jXng`>us&iM|hHVP9Nim+$R#zhteH- zpCX}Lb+NSE@WSaci%z+pE0}V>5K``!LdyM0NV#8wNx9!hnBAfGEdqv>?*Kk4hMTAG zgW}hg#Ly2g@eaKoE&fkFzMo6|**p;Xg$oh-RS2Qqgb?~&2%$ef{S7p|c=I#ydB$f3HwUrcBFm**Li3x`vVhB63Wm$vLb%K$gv-1_xXcG8 zT;`Xs*hRSu5Q!$aAP~8QaJ!~jP`<460&>lCVauc1=i!^vBIbekqFjjhVnT>7E`)dw zA;f!vYEGs<&8ZjuFy+4l*O6NiSKP*8#{XKIalK&yO{tnzQeR@y zM~o*otE%zb3%S{J1O7E^5$HK@*p9U2MeLRg%HYH zg6gKGIc;|<{Gprb@UO^ijVofS(GdP>jk|5gjMBt7wR7lg+geGG-cG@g-d+gl9fXkH zQ3&asz{Jk=5{B~!WA(;5&tsX5b~l%h60f*;;PfcoMny9J57Tn8RnDJZG^45 z{=+&RYj*gP>V}gscB|Y`Mp&uXtx>VCTS(098K8&1+Zt;^77oMi>4Rt3YUO$euUA)H1F;WP$JIPEH7cUL=(B{G$@8xXnO zal21_50%4e9U#|}BFk$}pO^1RdzlAC_U1y0>?1^xeT68ppAbd%2i23z9`vLG@Q0ps zAlH0U2v;2SvaH*6?+zvv*@{|f=Fnvhu`FSCsDfd4m=Jb{3t@MJ5Ozm`iJ6a*(0>M` z`#g>&5#~Myh}^Nb>KidR>DPJRIL?wB?~~LuqJ7uTT;t<40nb_P1WLtvl{?OfMhWYk zq*z$*WFgi&MTqrI6=J>9Kv{22-QG{flXRRj@I>xRiQo}KL zUYGm4e8;)MJScJ{7gFRZA&OirM3HNRC~_^Rj$`(~zSrRo9p`$kBXKd?HIziCcgu{49cXyJ(-A9R-wQ_g6-{@f02NVmlJ}AVj z4+$~r!$QpZ2q?4KR~;V3lXSPo@I>x$iQ?|orC#m{V#7%$Nvk?^whc?o@Y>$?0Gh)gZM2t@8B-0o9@E0q;;;ljkCO7@p<{~_NsYM zEBc|(XIZwgW5El}Of>_K;X8-M6-?{FQtcX7pWjq!K4ZZ-<{9@$ZzIH&dx zUG04<3)&wj7}_5Sq5Y8%+8+y{{Rx=Z|5FKze;2{e$c+m69EjW(xawvxYgwf8ZuX@m z`N}7$Yr~}&e`@Im${vgD%KZ3HX&8+=| zC+TfJonq&?TPLqNOr^zJr zy{+r=CnqwMIRy~8DRH|`eJYhxTawnf-Zr)6HI2{9_qJ)xgCbQ*gCf%jQDk}{ip(HH zkr_etHnRu4Z6^Gox6RCT4AqceI=q|bGsmV zA*6V*OzS0dk0mSx#V@H~itjC?_@#stUn8XWKAHM4!a=wA;YXo1AO8fw~R=C zrK&B7YOb*_Ye|;#Nql2p-aOD+feXK2=V*HAD8uPLP9wS*MBwvd9?0c8){X|=9|#k7d^@MDYh zfyixut0oqgD^?YnSU4Tu&c)x*5^m%ZVv({HlmjgYIvaB#dYcHLy{Qn|n+c)0Ihd}X z9E6Vv8CUXFM| z%Q&{SpzPwwZIH;G+X_)&J0S{eFGPVIgeb71Ft>PeCrQSY1XMt>c(NY9UpzU4E7o>XM)q<=Vq<10l3nZAV3|O3m;$CLTkAL+F%>-mh+HGCt#vFZGP>+6 zM3*KZx{MT($)~m)znqk7R)q3pjxC6jWsalpu(L{{xK&FZ=ajUzB;7l#aBQ`x&}mZ` zblQcOe6$eV#t5OeE10$DSjl~>wjy@JkFvW1e3u3n0@gT1$@l1Zabsjr_RK`d@Cu6? z_p)Gk?ahUF?IVQOzCw8ICxqAjV3yYb_`}k{1G#3J16S6Vffk*sSa&cXYJi7W3<^6` z0t!1!NMVNyDeMR#g&hfMK#>Z1^gc>h>9q5s3BVf108CEc25X2C)<{-4vWkXjL($eke(wy6y_ z`!E~qkEHc`8hH`kZ+SL34sYa$X8!Rs>R|E07R`;j78*vi3>{J9&LkVmBKjjX$u1hV}Wj3k|OlqT$s-G`vQLhS!49 zFj+QqodU8ihp$Hf*&6_ky2BOOxNvdvWaBMcH(9KkeJtz9zIL_dMB5|OZ*H+rxZTQy zxZNg%+wDTQ-64eAonW>l-i1HBBfgvK$lZhM`w02oYaa5wj|=5{zmR+%5R&hMLh^kG zRDTp%^~Z<7@OkD(xMqtJt{V8ona*$LwY7}WXXEOddR47%i$83NexyH3zjZ`Qds9(| zPmkispi16C@anlInJfUEW^P~{tJSD_9PYW^5 zGoTv8G_uUIc#{8v&*6#O^Acg2ve!_FY1|7$frw0*5()nfU$pcPc}c+#d07aNaYBf^ zB814RU_#_I2`jvYN(+6R7&Oy2fXKax+XczDlw)m4O8FKXFKT$(GI+;l;Qu+kYaS@S z$Au`rFNE?3LMVSIgz`tA8kT8}`98)U{yBcaHG8gbMeJxA*1xR@wz7k@DuZ0-l8&LH&l^W2u5*GiR>V5||TFm!A0uj`GM|R{(bE6q({~v16j?*w&lZaDe&IsK`&EeXeiLH6--Q_O4=_9A{fR#e zO_R{&SQdk;7Bq$ylsprrJF$~nZgcy{Aq_fZe`1a&s2Ws1a#T}8t*u7$AE4~pZ|VNa zEVsh4{g&(JCW8YFMVhA#C5$wa8$ooPLb1?wN+G&VB}CV$h3GmBsD@$-RHns~j5Jkv zA~&5xXqtQSoE{-X%NA+TVQiVfQc(1a3a03pgcLoqkfLW1QuM4~QuJ&Rc6jof9T{z7 z4j^)K;+7GaOQ~v0qM92&=C&mB_#}S(nAbeenvV<7nqLU51%%LAPzbGsK#d=!9lfW3 zKl$smFrLU&ON3E2Nvl8mN9(WDx?6<2DP0<*whjG%Q7afF7E>@vEG|Te9zvApDMX20 zplmyx`u`FV7XJ~pOOiEJ)Ei(=7%pZh#VW{FzE+nXlWq| zEh9vs{z4R57F4a6UC?Pc{Gm@S&voQhz*VJaDOKn><-KMAvB*YLQuBshQ)^kkW<>?V zW+fqPRu;l$6(MX^1(T+`8lI%rtd56eA`-!6>XeIH6B#9oY+7>YG;3J`N?u#Rl)R3R zlGhbd@_Ir_ULQoS{IicNhAUpbqZ2U44J zAyR{ckQyw6)D}WWZ3(J!OgAcLEBxV>TgNr?1h`_tfgzKWSIRbol3Wy0(}Xs^ttExU zb_#~Y_Ci?fAcVz^LRjns$}}^o&DTpnZ8|!9;1cmF-C|U zy9&``tS~ppvzsL2N&@OCndI3Wzn|pUgDbY1nSVfCHOl7aQ?jbZ3rBmoJ&8^Ok|x<% zp1mv=cfzA}(~S35cK{AL6N>lPt=~nJ5{0Ve01;3x?jQT!`LjLg<|?gx(oK z=$#2>>79i?O#PhAb>z;$m2EVH#`WyZMW%jqo`q4&`4Ujf1wx9sP)IQs2`T1cPy>_5 zYgD*I=m*S@=cS0Sz-0j6iNy^T5DhHQ$#l;Z7XQjj{Iu~U(>+&NFg&m3LOib#!t+`o zJg*bN^Lj9AjvMfYhwK}<<{PrOftku?u4V@;^AF6`WIC9;Sta?u+cs%nB+%zp$<7}Mf*ZnY0qC1-wBxqHcuik7jsg~YtWef>Tw3*PrD7~T&E;r*Zx-VX`k{V)jc z4JT7$c?3^#Uw;%&`|I$sWjW4g>Hj*sVjk3bl?$o$nh>>K z7oyf1LezQ_R1Y=lVDz`}hrbSQa~-*Na7A@)Y~ES@yLX91E@G0}IQ)Zn&vJmw`wE84 z2SUhvD1^*MLdbj!CN};=!Y;OgeM%f``WXK2>37{1^!2ww&w}3;QRt-(;XiH0#MY?xA#9@@5q3{j#k(kL3j-TkTkD70=lL`f z=A$tg*0V6E&1rW{ANo%lZn1^123<4`m0!Cu3%zPGUo4yO36ikCsi4macH`vVH2y@M z0bCPybZrt(403!Q+dfgOrZ7PVjiyZgW6a%GGyz&}<$>#KYag`SZxoA``>l|c`<;-M z`@N8s`va(!JAHVG{3C*7@cIc4^B)q?kW~3viMW`_FPBY?9p5SM~6S3sKoySY775oyPTT^bx>GF zODi%Af3upd*ljiiW4GCb*li9WcAHa(-R1(-i0r#Wb4ytK|BHdvK4Hx1P1mU0YDy9#nSyjQ9 zW;G$ESzU-})(~QvH9>!ap;51eC%L(-jVE&JNQ7auuKMpWj9Zs1AuhwG#KYZbJu465 z>nj-I8wer3p%CI52_ZfZOo(qRpV>E@M2Jd5g{V{nRm(Qt-5}wAWQ-a{N!0#uAaWycF&Wy?jxh;(Dqa=r0r=!v^`yj zwr7A_%)qm7bNi6C7S~)~Y;k8ItCtDRQl!3`A?G6~EHM5KYPiZ?*I^PmN=>i2n=|UltE)qiNVj-np0_KXoQ~`c*TE3*q2*8?` z1ChG|SJsS+7fUmpEj7K;qFm*p$Xqc!E#0)25m#FfEUw`~tgaQp_BtVKuNT7Z1~7dY zaU(v?r^40C2pzeVV_4`pw26f`nx6CWUL*SG1;ouH$i0BL1ws4*;#Mv>smikSv(Mg= z$tu&^Ehzf};tnLT;GIIa-z9|m-9otEBZT|C!k6rE)Ofl3Bp6o`VDaSr!~OXE`-ca( zirjj)#pZws=GVeac>PJc^hm^BBN( zCtQ2U@q{8{uqTBW>?t7zds;{)pW2#BUxkC?X8w%AKBp~xaY)v7&m!(Q;w$>eb6l}F z$@~NArowi91+z-qWURrWbxGeK!2!n8cfa8d917Q)XM0h!ixx9~Qr-0@Mf42fbqC3E%K(|%` z=&mS)?n*-Ft}KM^DqxoGs*?KyMmuD^8X=Hf9bh>MZXhdCmB_AXG1u}j?UdQBp-MzIwV0dv zn0D5F=QmBaInhLWkVS{~U73u`tAzhQ8}P0X+em3CmY5xU> zamDHr^ZUD^O6C=E9lieVe1+`)DAd%q7aQB$2$d24*=)43AzP9V@;eJrs!51aBZVl@ z45oiJTk!GNiK{=Gi^0~iE?@KF3+6>w+lZE8uMz$9mva}A<^FOy1o2oXtBF6x9(*RNye1~**c2w`~RJLa>c`{ z`3KZ(h^qcSL;UB<+q7r=t|C75J?Zn>|CSyUABWluSG)~sZ}R1KC$+Qx9rv-~P-tHT z^eg-CxF2HL_5MKQ4#2hljt43-S|21t>w|@8eTa}uKCR>2w@UQgp^EXj|2LEW6L}aR z$?BNH@kH(jiMZM8U6OB6M=E)3Nv85zB>#ervbbSA|f0O$gQ3!EC2^1Ap=+_f0&JdrKlZ zMSnWQK)(k_2TBiXXd600D;-8PxRH&m+V;k&)~;owRzvVi&B6pXy1}*9xVOoGt{~#f zq51K@6z0(0vD{($u7Y9uo)D(*3t{?!5T+l3Fikh9eWZZm#MAni^w|FsfE_EiC|QcR zN^`0pJ;nPoi}ksWWg9*0Xoz@E6vtqXZY*+&w@$^?z|q(`Qv0GD$JW+26&iMB(T7aM z4M(STuRe4r%SQ?W>zi3Z!s)ziEEyTn-qz4sCBxP?kL5(#kwY4r>$MB3(83yzaOS!m zakve|D_8WP#L!1;+!v7R)XZNRbIkmeVqxa5g_!vpA!hzoh?&0wW#(k3-1iFbdt3f> zD*pgCs_;jE2WebYVQdH0n6JY4z2(mq>lYu(W-fe-)TX_#gXLEX#Z13(Av66h#7ut( zG1H$y%rps$;IsW^QvAvKyUFnIC@m5FW-<29cUXGFGMJuzy-}xU7pI48hT67uO4g{_ z+8vXBs}C&Xj!{mV5r@Y6{d-MgHBFdpOk*0`Mx<>fm!8+8p(sw~Yi?;Pw2opw>o87< z?@dc?ZEtF$gR6lyHHDb1xg405Y#FN4;EU{#rJP)|E!4XPvJv-&Vofd`C5L9Lg8(}e z-B@-aw$CM(MUI~|9?1#M4WsIvv9T8b^rKk6R*t9+1=@bc^18^IHmwXh_MR_WH0{#dC@!xpWqgcRcd>%lUX&RF?xR5j=)UBk`MbPb!Bvn?;LZTW(4wjA zP1l64M=S6JgI(Gi9WAEb4R0UGA>S;%rP_X>pxJ!5<# zSE>C6HR3bbQ!rvMf@`2kZi2SPV^53mKZG5i&GQD`aS@0yTo$5kb@8 zN!}Yyk0)|7NEH9;w{gkMh=g)AY^CLfmxeQ0bjqDs!IV3TkaA}gQtoU*%AFld%AG^P z>?*Z65inHG1w?Lc+&qPO6u-74hJMhF_o>cn@#pjL8MOHuHotiwv;Y?(w4e||3ke}q z5JG5SP=CWrFaCp9;}2`T7vVZ`i{iq==ewAB$airrly46q`Sui&Z!aPFE&(cEanpbM zCBbCu?~R9zS`uO7HJNITyL$HU?QGwxN(YxPC{!BhGowqlNB4;v(I;dSpU9DWLPu*? zBU9IwRBLGq4Lzfe8Jmjht6(awpOA`MT1dq$Bc$T`gKD9+6?0iUNzYgg4_`Esh+5M- zw=QbUtw3BDsk&1}q0bDkj9^r&U>L0^gwaYu7_BUX(JElVXjKXQ7ihXFeKn%en^p&y ze8lZ8?KM?KZAtp(`q^5R)7m~K-yha74@#`dg_KxNh!X1yQDOrjN^A(KKbS4(4;$eR zujL1F9l4Eh#ju+0@W1BX)t?i$3Fg9{s*|*Bg$Jfh&6ZTlW(uZSHWyMYgM?JeU?J7A z1*o=Vs|vT2u=u|U;NNT4{|?<&Sc~qZZD{PQ#HI0;;#yIQwyvXhQ^~5Mu)Js+OR}v` zQumNetoeV7o&M2GJH!P1xn$t|OMfW4Hv(t=M7r(JiAGs@2;SZlrcv&oSTxEVg*3{Y zgfz-}A&qhfs75)fZk$8$Btvi!PvjaTVx%Z^!*XsIk)b4;r~M?1!NV;lD2-4slp2Ll zDhZ*qvk*#6U_xo6gvGjU72ix;T1gAQaoo7wCcX=iAug43qp-8AT76c26mByQYP549 zHAV|jV~h|rb`_$=SWu&|Sp(zlhChtLyK~LKQ@Emd0k-`=(db+RV^oq^(h3d(;hv@r zmf1_eSY~e_mf1&$W%dt<{+@KpMDBQ^LrUgNTV)t_PO!Wnb)teHb&?QL zCkr8UiV#w#f(fb9B;@woJp!i_n7YI@1LLsVL1ZwCpi(ul5@rR-360Re6DXvH!hJyd17UnL47sRD}T9sjd zx!g#j{}l>G|0{*)f0YpZuNI>JHK3|;4z;gqB`p5yG`$X5w3+Jx&S=NgFcPb;I_i8F zxzUo`=6nTaV zDe|lkMV=F)$n!!Jc>&Z2V)mdDy@)@IATMzpxtDR15hQ#SFn;~=-@8NAxN-1;xRg&T zGK?Uv7-{r>Rl(^0nh^b87oz_gLiB$VR7K9K5#%ii;}PUvr0LtxqRG4iuw)ZgBS@^i z>Zp7K>EiU~_bjLPeNJ^ZF*i_QD~4^Go~W%DeDaDT4z%k!ymjEoueq(hk@u9N>zmqn zU1zh)%;dKgdc-@sd)NnbdyJ|d+tgBD>`@gT5ymui>nL7uHdO6yuN|u6=+(8=gZy_S zt9$!^IAwLMkEk)SI-bpG%?d4G7|O5mz%`}M9KQ(fCP z^5rUi_*wKZ9isQO=>0m0USAy9*xVt7FQ8wPd(V>k{1y2{Rqg}okWNr};`&3YU^>A^ zibW^*SV$-ML`Wz2R7fZI3{)qm3Ht*+N05xNU*L({ml83`<~F^2g^=Rap3*)T2Gg%C z1;u}(V2b}%Nb%nZDgJvQ#s2{M;^~7wO4wo3%TLJY06zm9w2xax+$W0{?Mmd;UPuzu= z=J@aS95*$jpe@zYN(lqwG{zY1r&TPpuM(pDbV9VBUWoQHfT|QbEPO@@i~lY)XMz)r zVrGEP1K?^@jCEJ-_;wH^3hbyH)FkGM|M0sIKzz<|hyZ762l*Ag&aMNr`1>Rc$} zHH2imrjU%+5|Z)SpfVOYX}=B_<}ughI&$mbsy>cUePr)qy2W(3b5&2k-KraRC`B3X zT`6+wi+62FCP*7Vcqz1jQO61!Di|wlB*Y2>g;-%@Ay(J~R0CK-CfF2Da>v;WPvkb2 z2peckVAck15CIe~OQpq!yUt)sMe$oGnBun-Qv6mzir2bo6~8r@6u*sxewARZsBMwc z*0uxKI*eP9&<;vnTN3Tu-DgKjwv$ih8(+P7pf`jI(Hkm+UQr0W1|jr@fodbBB?cOf zKWTg;@Njs)M4|DO%tOXIbD@lzgk(HYNXE@VGHwBtvB=5tqrlMkcHx@y@^Gc+Xd4W2 z?XA0Qt&4WnRU31yB3E0Io@o__7S?9`P_*josJeS{F$R|tXqz=Xj568aqt(m(CR z?f^n)Wd{PxG~#wb>R{ziTN3$PJ3GV@9_kbNc6OL~pm;bJqIiT5ibo2ec$5%|M}uk( zrYUAR27h<}JeF%F>2O78xUAI8vF5MV|M8RwDJhnkKm3O|!3d$-i3&!ylZ5DYvJl-) z5u)3vpv>P>^?#a##s8=lr&A>LdIrFBAueVt#j44+R*AW{S?M17PzPsO;BUk$)jrH2AV z!|3Mr_LtMW)KXv8A+_D;%IIEhv7mbe7ovNm5V}_hp?kFuy4QfB+go(6l`y4y9p1=Y zkDH|{8VTL_6qWd|;0>1G#yA0o7fcfMb~oY0tP2Usc;0Mr;dzUK;d!eNp0^3%dAksv zcYxx#lz84LVX-bQ;4XX^_ilh0D_k{&xKuIfgzUW*|2`i-sf@~h?eDi((0qUk(R@${ z&4+~0d{_w0M?lf65zR*>OwIWiUgo86v*r|ygyG?+6h8eETImy(?8!Kpw#ROvQ`&0X zQ;0BZk6^lS>L+~LyPt8jajFOAEV8+C z?5MUbw@%e)>(nnK%x#_e6+ygp>NhSU_q%1C-8z-**8jtTvfHNqL?Tm9G9QQzlM2yc zG9fxlE<}eZgt=`~Q%W+fB*?a$sqp)4Q&V#lxoONlpl(4FWfeQ?`@^=WpmsbX*2_&x zR2qx4$nJ!yvK-(zox*F%c0x^$n7W+-U?(uH?Sz_1kx^u3A&Sf*M3GsAWb$bpr}I~4 zq`}cdlUZ2V~-> zZ7$gfQ)|KST#*a$TuBJem4)zJMF`JT!K^t}!=Fq~td56;b`sG>fb33~xFWS&Stsh& zxHXA@#^T2o&~1qQ4{QMq&1Wr@l794QZM;3zW7d%zeb*JD?|MS?U0;a48-VDW?x)#M z0mUwr+lXjX)qcV-gaZv$^@*tM-t zuVYO{wR6GF7C&p>T8I^8{kK_{X?^VxXuz+H0xV0{ss@F!jC^RD7TLEJ8k(DJFlPTu zpHMw)rD<%fQkiUtsAn?*8v@!~eRC_j1Xy=Y!Xaa|Lq~g;;v-hrF<{4w6tvo(Qmf*P zKCD)6E9jG3%A>Klv8}Pbsc|1_iyGoc{^*Tn^fju67?NH8(e zQ4;z$^<9^LG?6jkF#umn#D#h(CMA8$aJi@VFpYMcB{|+Fsaqax%igah?J%5hU1;n$ z=CQoXoj@MgpmGyE(F(u@Cn**-I9Z4dP7z{*Q-#>zG*C8}E<8S+jv#5KXW(IaLL%xW z_kQmzgcL7*(kcio^=wN)@#iR*;?EUQ{CPr(KVL}k7l6KaTE&GDc6h&c5i%@&F~H0N zZW)nFm8!NRs=4-hnI*a0C-Lp|3iCkgN-jj}Dj~G47DDS9A+)Xq)m}|Im|cfIwAbso zX0;BksMMr2n7Jv&EvRzE-AGdM7QfVTq4C~i`9kq#1w-)`Arx;FLh&{s6mJJ*x#=~w z+#z9cV#wS{O6+?V5V^Z?)ska|(zLuK`<>6Y_9%CcCA`-sv=P0-quhNK1o8X1kRlHV zQSd<_3O*!6p@+frQSK3Z%s}9VM>)QZ(5*+g>GUY~7zuNaa*rd3ALX9lGICE^))gP+ zp0c3qqukR-Wc+7@=gx^2Pz04J}66UY; zC>PX@n^Z6N3Q=i3(jxmP_p0Rp$JZ1vUD>1D>xil7Hvo2A<3iM2Y4d)p+xi-J<5d)K2ipJzCe(Fl>69X!|M};!Ru2Y zhW|{6lAjCV`30D@>z9)I2boaHSBOyjYanvp;6lS1s)+d!BYu?o)}nluiISlf9_7Bb zV5t4Tg{b`~gxXI+sQoO2+Am<1+OPP-qug&?Gn;@LY!X+m`vaM7t$$h=#Y{3k0*aYb zNHLQMDQ0pZ#Y_Qes1kV%1yf3%f0UaF5f+#lVA23LSU@zeKqrrK(^~whO#HOXC698` zSui}O=R!PZ5W;gtAv|Xi!gFRYYmQm)Cy#Qo;)&dB646Frm3@?pD>8kQo1J)QEPnso zqg-e{bEuT`QEpD-h`w`4j=pmX(RUsp`pzpv-}ylFO&{gvS3udLT$yqU5RJ-O5a0+h zTr5(GHI|uti;W-U3KnZ&AFJ+D>{k9LH>!!%Rh>V{#RUE@KFL+1chU|@9V%)OGYS>8 zsA5r3iwUWy#f4N<4tTf?E0@w+0f*74x**@b`F4i%z*~DVTEC7EKA41L|j4{{q@{7rm(|HpV!^FU}bE<|W^A%q4AAv9PBp)Ek&ZA>rj zHe2Eke~h={I&yWm;xV2FxwL-V*2E?|QA*7e{tItoS;1;s1;c7PA*{9+!fFR0tabzw zGwmedcpv04<<}D#6Al3)Hxw7@rI?iTF~e1SkSkh}2A`zzgIrS1_#fnkkq0)Y+(d_4 z0oY)KVqt?uAvP!pvBAzlY|sSC2FZimNCZhUZN?M17Kx~v+=JXGgcL7*(kciobr(xP z@lL@M-zuc|HX+5g3n_jy=!>USjFGUzgWRsju=H3Ua=YP{5!qd-YD=P;Yp;7)lE^3V z?R8J{Kx;29L~Cy$wDu7~YhNL>_5;;kO*@$Fk3Y261GtXdfw-cQeUR&B#T`Ua@)p0; za-s1aZ23a*5Cuc=P$3i#6GHKDAry}QWjTA0J5s{@gIqVs97Rg(do&QaV{p}yV}{bS zyd~!!?hFL+W89fsM(!-jxZ-2n*%p+2j5`O3Onfv&f#SgOGA`JvX6w98yob!LIHD>JrZ7tm?m=-5V@;y z?UC>rMaC%C3NgxcLX2{~kW4C_b7bwJ%+}A{lKWexFXJ8rsC+LFx%+UTV2xd*{HPN@ z4Bl^19>_$=5DO234_Yw99^yj89u`9E5h27L6+-MWFiY%l{K+|oPvBufLLv-OcFy5b z1n80QX^TK%&qzRF&k8B*IU$8TFQl*+Kn;3QL63wl3M-s*_!4rA@iM>+1a2^f2w{xm zxiCDozG5+7^)V|Q?fV)*qWZc;f$AF)K=n-_RNoRp^=%zX;*@s}PRA zfmx2fOYToN%w+oqQb_&@L~fD=Qj#K5iR7fjiQHs9rv1aU0m)5{MEs_(5co|g0sN*C z!f$FJ{H77YZ(1%9w2h_;s&asREg?*7IS_dv*Tfw3m_KH z1uYn!3rPUaf)Jhy3*lKUgy$k)mgl09mmOxg7*a?s4n(d8ZXhW#S(5p~EPGn~UYYpm zjU}1)S;B&$x+E8(+FJOm>v20;!oy%`r(P((h@Q973iax!z^vYw)eN` zVU{&+86q>biR3?bl(WBC^j8__)X%a;6P1^f9F>0I&3u zga7m*zYoW@*`Sa=DYV5^@wcVIahN?h*|3-1#q;LLPR-P@C>l?7{+rJzISi|c^AOwk z7sF>r3uZ{ar7s_wd~{UbF#Yo>^du9l8)$4E+SFcbDE6uv)5v*-oYdK}bAz3|$>)(r zH@395`V8Yuf)#VLlHKZ5!j&5vf7_P%*S+g>vzLi{9%93<3 zJBd=+kJb34{AtdaGu*6Ki#5cq(yg1yhOJ2&u$vg;e5pLMm~4P(94P zV7CLFWX57gJdxW;B5H6sJy15h&l?gp{{C zSh`N(R_q=UQ%ofBjfhJ(;iy27)^p3AV9(MmNGWkIJdxX5BHF`tw1>eWawdJv}!*t*RUn z>h1)Kf1;0HwE1oLEil+&&;^{)Hcm|lQwKMUD zT04vD$eoQVEiLQXl2j?LwR0>I<(;cw$~#X;dFKl$?*bv^T?neys?e2v>UjN+>N-XYRi28IqL2vilNKPT;*-zX5)Z5w$!U5Gk& zfXS`pP6>_g-bDz(qZgG}){GCUu z`$vfE2MyX<$`0}le|^eND%T$zpN0Rs*BbvF%blPR{*PtPgle8cnjd?O)z5MWo<_3Q*e!9$_hYB6--%vkvL||oSur4+XtEaWp7W5XOSI(T9>tQ|Hi}d7T^+++<2m2OFoVQ}d#I9jv z%jmMi_AUd4HYpHO>>k6d^v>r8LU3BP?g|xXn+k11 zHbAx^p_2qk+go>ccXxMpcc<>|?tQ<{nQNQfkU*h7{-3ve!aR56&OGOwnYnl8j+mJy zj;+N`kw#l;8pGALIALLE)$Xd2gZd8|+_!J0S7s;~;_p|e`r*-lOH-X%USD5h?6;-W zVBZvL>oL6+J=D}qLa;XXlq^u)RBrwkZD}NI-!^gSJEnEp$+EULxJwr^Rh!+VZ~WIJ zVsgrZJTiHIDE%AyA$y+k{_wC;@&53LkoSj2g}gsJCglC$aZv9M1EMM1PY@9Qj(!qP z;GR+tFGR@%m8S`zY(2Y^cbDjA@iUg3vY%BnWj`mR?B|7){eqCPUj%*GywAR*!1M%_ zmkHoC;}w9-;&2NoOji1AUJMI|ov$+S zvpp`k{jV>)1lSnYxR!^+&``dT*0XsTFsZE3VAI#8cWn5LqOsw(LTvb*5F36k#D+hB zs;mpkfIs4i8_7?2_|m2z4A`Ed27VzejAZ$QQPg~XwTxi&o1$U#yAVcy2x0W65JrE2 zF{8f~*uJ9%Id9(3ZRfO>TC}X%3&0ZyFuVgAko`4?=VnBE+0R zgeVgt#9W}7hUo&$&W%6%IW`a1tQ^J_!``%v|7yMs38!D&Td(L31&nl8Vc+|t;AHdXpzvWyvtHnpr$(WaIY(xx&( z+Ef=IZK@npo3gEkyW)u-Cf)D^Zg~aK=Vcf@i%i&>wcQFNhLY+@(#)f$Nq5T$N<9<} zrJh14ttf=jNG5B%0k3gMTi(fKs`@P8+2G%{L%AdRjvcK8m=gASMWTE#Qd+JlueI@ z;#Nn?m_epYDrNNSS;I_#HP=)$)?7=7HP;qm&2@xWb6rrC()RgZPl37r?AF>q(R8uf z`Y4&!ya5on4RQ6H3XQ4u)B1C2BfDi|e@o?I^jz&5XDT^76pe(G8e1xPL+P=aa6HLv z0xN1`>0WzNqfBkwOsS}iLxt4FVM1!-=0a-Y7NBZlMsGq};)#3ht?&eHxPs_emT#}@ zZUlG0OR7s+Nz`?3ZP~$V8%4uwTOqu(XODPoCxqAbV9aX=1?HxL!;aj5#YX~x+X;8- zMA%v7W%JTNK_|Y8H9klU5w;3Jt5J4L-&opC{|af(K)dLd#p2oY<%5V3XxWhdME*eNjg zZwb&yX&AW)2wXF+nsq3ZG}?Nzo?y33^tad{80{OJEj^@K+AMxRw)7pP8+JGd>vo41 zhAG{!CmCrBvxib)m_3CUW-lRz34|DCZ%~G@Era*L6F2OA@dR!^1%(Z}UDCV#xdUEO zUQ%JAhJAo#2d@Ja4X=ZQ@H$usuS10JIuwj~9i~9vu-nJsaBjfnM*x945_jrEI7;PZ z^U^>;!#>*bJI3ed8}_m0L7?NfkU+-^5$FUV0-Y#Cpp!r~Y|{%3`(*r4!#;&;KEC6M zXO4zlxq6`1?? zL^zM~F!cFA;4Z*b;|}GLR$Fh}7uqcs`CBS)MCViWRb!gJWVHVEVp_gfxQh`08$`@#&4YONa3S&T6(Zh!Ld3gYhKaT-G@=LbM_t21TnFx9T+uxk z{m&dV&piSqI7{xtvQg*psPRSg#}tj|j|&m~2_d3CDMa+AKv}lCI*+Fnn46h|d%KQXgIwqgwuOMIK3}~(+6P8=|ctjWzTI|$bCd&>chuC;6A}^KlM*lPBt&83p$R^ zEU(XfUcTe_!aNA_B^MIpDEkuxSgb4C2sE)(*K?C{@f7Ee&&voE_z!k@t?X0>V z;RSICpBOUgJ$^FM$p5pVk^dJV^8YGC{@;Yi|2rr{+9uY2C~)RGtL{%|QDy!D*qsJf zT}UXtY}9%e(t+=3ftv+a7QC7U()OqPsrr0BLpu<@KF$htj9j`0na$+F$g?XIMxH~6 zkvj@8awj21?hMMv1N4ZP6HnZOl;H{7TnY+%kTwJ;;*g zL6D`mkRVG75o8%5f-EaUkmW%2Af^xWo53ITAYHf)Tsf{dS`RW4o#56LUJ#e?i6NsN zq??gO{^b>o{3{5Nzq=6mdkB%gCn!VqQ{`GwfivG(bt^%OD$@%HTyI>=kq^a}jf#7a zHqNT6u$=n%oGK6JV?fbfivQ~qw~EfH%TCi_b^N3&&kjmXm5a~XD454(Cu_8JBwd^` zb=q8c!PHjH&11WHf^?o;sw|tMPh>NziPGWW91nk6QgK!JC9WB*JpQ>^}%+=yJIC>1X6Va_IZfCm}#qFY0D6UF~;zkKk zT(uCz$=8F2re^ z5Ki?%I5i02G#*q{wmJc=-SEd%+2ILXqk^c)8FbU;0d!3yCOc6ou42uW6RajE8dej9 zu-aV+t4Tsw?Ey+tt4dRQDzKdg(CtN9^cDbt+Z$JU3pq)e0=?~HsrL1$yx#UR4-EI` zLJSWO!tg*L3=a~*@L*7SGeIGF2>w`ahvEs`VG2TTs#E3B6C{3exWkDi1Cc1!)Dd~E5eAJh>c*IBN+!a3B-Bn~6sWpD2N8R_;Rvx;zMyb%n zwL)}poe*7IFGLqNfYQZU(#4Gm%uP>{H<2SsyBP@FEx1xz$XuE+rRl}8P-(YX`rCZ^ z_%x-`-N@~h3Q_OiLZaR&MAW;4hUt9OUIiwnDcy%RaQEY?BJ%EPhj)oa zD-0j78y;+NgY}z5#(2n5!SG=&#PAUz3?CK3@G&6_9|y&7eKCAOfeFJW@iKE9H_cEq zVunXXGu;aJ5_{V2e8%5N?QWBMZx1aF2w73A$(sD!uLfX{9Xc+y~JL|#}FN^ z_7c-RkYj6H&Cc}=6WcuCr<1l5dzCv2wiBC7K)9XQYg`8Ib<4Ztc4BW>)H8>Tebx@{ z8b8UsNr;sBmJlJ{79zwuLWFo%h!F1y3$_z`Um=t80<<4*C-wn;zn$2JT(QlO`G-_y zk+g6-u~_c#y?ct=gMCak*gz7dw+H*ga)?10`~>3Z4dUP5+meS zLWKNUh>+h1$>j6OMO$U-zEz@jb8`b;cj>6E-KFz?CTowP+{p(E4sJ z!nA~TZi}Owc@#i7^9m_vJ|X4IFQl9WKs_SGUQK^Nq2Dz+%5x!tP{G1L;1fQZi`jk-2qnUFKQ_l^C?U0#gemfNB?jfgaq5swkDB+SO8a^C?^I#w_DS6qz*1!rhqqTKaye^hrC8cVp^r(NG=0g{Te`LUoW3s)L14 zT^UT*uT}8JuZ=_S1TL!}>X%*{H)NL{wF!3TnHZji?Qk^} zlWf7XI$k?SX$^%V=bA#~TuX?YYYUNc9S}K_Etu9-gnujKKEGVIpWq}b;A+TEIKG8%O0U7KTptiPQl!117s?ObD7 zhxusfsQgV0O;vSe4b|1nT^p3 zr}AwDFaZ%)l`mAX>YA^7;TB3GEY;RNl|7MsOH6N}w2j4LgKfEx4fNAlHrP&x4Yn6z zgB`$hZ?Gf&cv0I(Jj^Ck5WT_ZS^wFp{&dZYmb&@F#4<@ebv2EwUT!R009(BDEn39g z%lan0{`p0*VSYN1%vR)T)1|P9k!Rte*oN^3D_1-$)% zp^E^2v?6wIt~tgF7al&}ea%C@`*ERs_ZO1y0YdUUP)NQ9fy!6hq~n9Zxbrv!Pv8z! z5IR1$L;R}Rjuo*}*Huif?!g@fS;Ub_67xsZ?r=iw#p4J?qm?6tXyqs&S~*&XR*nH> ze%sCaSUhpHI}Q(rg((P?EZ3n;mADf~3nS?=VH8!!6D=d`bdsWBbg~derwCzmst`t} zfia`g71+Ktre~0ps(L06xU+EEOZ#k~E>Ov;$3mXY{D5>RoMRT=E#3`sZ-_9#GT#ymhxg8k3gp9d0#=FzIbdg-LH0V$wT= znDkB|CcO)kNf%Iuc{iT8cen=+2e2uKO1x-?)>Px}BMC&L%A{^Zox=TuS~vB8q9O92 z5F!r=A@Z;gB9DMEkw+Dnn^K{Vkph!H4g~HA+%`x)sT{L;302SqJY^X??KALQz%%AS zch7Pm%FhX*{Jap#F9@OhBB(CFBu9NO;g7n2m$?qyE4U(dYzH3c_TxrXD|}VUwDl%8 zV{4Fm6>_kb1`@kPeZpj8juKu|G)j0~h!WlqqJ%evDB&$ocC(e-Z!0i2bBg;8+^8|{ z0)cxESDi$t16ix}PU3yLU0L3c8HnErUON z2ENPq(>zfAiwjZyTL|S2T|g+$B82j+pt=l`oGxQF{85)NJJ*4m16Rb(?$Dvb%w3;c zN2nr;^pRLG>OeY~9H^wTQlXMLg{Y)Vh)U)XqLR5mS<&`DnMZ-S{|my;3sY*-d_dsl z$5nR{YDAVS?oQg6JGOx3w4l$a^2=G`Su)wO;gjmCGnt_cxtgqv#+9wzs1P48j9sG3 z%C@R$9N$pSmT?={Kwq|u1JG;Y(Flgn{O|xfm^U@MdTneI59>A8<}&RX&ErRYGl?6s zJCqM^atzaz_lhqv6%`ek*gG=QJF{6hY`FE-8?V>i?Bju#Y-U*VxKZpC-8(ZvLx<5| zV`^xoaPSar>+fDQP8$_Qs)#1Gr7|7pCy{w6GCRaG(7N~QKY+jf0|qwne>8u)4an`* zJ(+UWz2CqA&SIJ@a^P+Q_)90~KY-hE14a*YM3L0()_*`j4im||dg8!AP5gla1~pBb z809dsjI$=OJgsR&L2HVB?JaE8g4VQ%Qqh_g71Ej(6VjR%7t)%R0M(j$Mbp!kBp~jf zm%XM)0r+NoQain%MeKMs)b2oj=JP!?GB1xPSF&f5mI~?A;p&qDZVS{i>Gtz zroa}{)0QWUX0rmo2@tqNM0)71Y+h6gy4{|3%ZmOM-|ens9%%LALbQ4dp;aM-Rv#g> z`hx0qO*)wM!ykWS=#M9G0~CZ(fDUc8H#d-ESIxSx<;O>kE-*10nKk2udE?fn*~E=1Ld0F>%n}1YnPTT+t6Xh;0G= z%`DYWpQ>^=^k+cV=7y1fs~Xtc3P%H5C>0vmQiuk&5~6|OLNqV}lm?cSMYmR9ZiX@5 zhU`(|wg875;!2637}8mR61THd+xt|NBT?cE?aJK_l+>y^cQhKPbEHzC&Ygs)b7vvy z+(n2wt3avKHb)qxz}&yUy_$khYz_!q4XzX$3M4%iD0Z}^8sk${u8Lw)&zq@zh`F)k z)2iBPtq|0fS1Q!Ds}Qx-2~pcPA!@4!rM7a_!UhHA{xP%hWP?(60|Mu8rIe7abWos_ zMoZP?Q&ld6Qc66WT{H2m3Om7WM%al;g|NE|5q6RgVfPRs?4F>6wRQG;DKOV+i2>0F zu{XdVGp>XPX^68IBAi6Jucg}0r}7V+{mlcZ1Go^W1BH+}NC>Heg^)S~)C0#J5E$W5 z{P6?lFg$F&ub}W}QmV@EiW0q^xFbkHCL&V&lsVGwhs#llhRe}HxEv#d%dtYZ90y84 zE2uUcuR#AZsg*)cAO$))5eVE#xYAL`M9d3xbh4#7#i#N*I@LVzI*kkQI$a2_GlcLu zQwXoKK-&5o zgIpIV8o4eMBG*MiC}u@JVEnH zOMjJ5UpWiv9vK-X{@xY6-CS*{(8D!cNDtQv(Zh8@^l-fpJ=_3F54MKzMg{trd?O)v z6J9pO$CZ6&2@4brV^};J@)o<{*3=CF46S(;F}%%E!SHr2#PALw4DS@e@Gc;~_4@ z>tP{$9}&X$Q6c;u1CzOikK4R>ju7ecc_A{qAVh{2g~;%d5E)(;7ECpKMIn>(0+b(5HGCDn zpK3UntH8Zx{vnmM2-;$*VJLR^C7qdunoY8LzrKBSV(Ek$*I2WEQO+z}sGM1alrx)m%Pi$wKBb-58CPI8H=!apkHtc8UIjpKJ|P6>7ea6WAp{o$(*ze%xIYIp$#r1@ zp|}XZ+F0C(qNtRjxR|9}+^4jelLZaSEkTTEE@>&Cxs(E+xwH_P%Lt*ltPq;ZfoYl< zh5MP4g*kU20;=Ue;JV^QR7I&2)ozw@d7si|P9}}stw6ANcDHDF_D}#kdkW#Xq7a@d z3E|lbO!Mrma6fZ0m2Cx~kn97nt`IjODKe!<_Oq1zeM%d6iFzY9fIv|kXpvAHqyQ)m z7D91lArw~;LU9O~rkGW@A7+U&U6n8ht_B2db=-)ch?F9@hNWE7rz|m5b}eGWa&1ci z%XJh0%XNjYTu%tg^@Xt908F#oP~oMf%5FpiR5u0!w+U`URg_9m-PBTU=2NzuDm#>5 z@f>E+@Z4Mh@Z3TO&n<=U+)4<~;b5BQ2!$6-mED?9NNxiJZd=@lq{yU67EYC|wDjAh z(kBm=c&hC777f)MxDeGHg-{(Sgz8R0sO}7=`@CK7$3H5n@C0s@g6Q)G@gT5+H^X7y z(KSugI&#x@+ngO($AEBSW0ejJOi%o*aMk2Me<$Y5rrn-=X2fh-{{(kAm6A-Rtugj! zVzk21#26u(7%M~*wL&zJ2hl__nRZu2$3=_zP#01yHck#XZLn11 zeX7caS?mQxXOs@-bqt;M*`ls$l6~nNUgIXzRx?%4HB6|@p=`FVtn1yR!#b*}tFeG) z?{W5HbA4UyIL^w*m4y%1c)DP0rt!`G+*F(J#|shVRak*c0gMw>G0V)=_|qZDtg6~I zP)587e$|Ak+PbPywRN>klQMho;h<5wEH~<%i5fAcrh$FX#&c>29-FgR&Gg_JS60{H zXWBLv7Z@H~SyNx_CXI)`KUsC{^@sQ75Rr&iCX8l&V_8joW3#>;FlVvKrXf$V6DxJt zD!R#OR$zvMOK|mWONN|c>80)7$U!wt6C2#F6>c|lAJ@`+i)!S|FjS*PrJ@=&38_ZS zLaNaOA=PLisA?3?_}yI*x&JK6f@XnwXX->hXGnr9kQBR3$GQ%8a0f9RkSLO&w zOCJUG{2WVlu1{6Daa#%s)q;XTRi$=14&SnEwz!VMcIT06tBN|`ibPQtC>4sjP>7-~ z5~8S!g(&J0P>Pz@2D=oPo6bBhBU2Q1Ilzz>t`ruMmwpNqcBQ4d%BQMa4TWvN^O!p1 z8k)z9=;&IdLPysL z(b4rnbaaCd9o+~@NApWZHz_dp&#B!^KB(muAaJ+hN-ZH@X`w(Zw^^#&eX7bWeLZru zJok~lyphACYs#b5I3_=fa5zOet))>7O=DwKspo8|t2@ZORbAa_MWd^`lnPzlEksxM z2+`HOLUeT>C|xZmUEQz1+zjIT0GXq}2Z6vngewJxLP%c)3Vhg7J>pYU4nu*P>3z*Q zr+PnAf!FBxF{76{f0Ezm+Um@1%~kbHdgE$tjMg^!^-trg9LEFlhE?GnCF@qT_n4K7 z_8wO%wD*J%?L8?(drt|`-qWD8XLD(uQDAOHkbRb%QQdPu;GV~o>Ou*mDN`N4grZ6P zFId7CeZtgJCA~!GC5uJIm${IPuLzOxRUtA?79!(oATq||hOgs~XZgQ@hpi74#1mz! zS*Nr_s4SEES9}N%HVl{VM6cwrc}Kg3ajf3asAJaWQFK;c-@b+Gc#{0}JWHxfsUKu< z$^ZYY5c)r{9Ox~o7j0FwI(fwyKwZpmfba#hEZa@U*{ALV{($!R~IDVlOW7gFvQLdyM8 zNV#8uak*bBFufe;8vlLf1jgi|*Z%{5)N}mFH6yvWalU_>hkQG9_4&>sB;Q$uK**OV6-t>)2>H2%ke^2g`FTNEX-P4k4^Lb>=EoDb1r!AHgc0+?imJ4J%aD7S20;uKV+ zW$pIm{O!IfWy}NJE?kIixe&Tth0yILgzoa7Om0%6xE1h6pOm|E9k?F2qSX(*C4F)` zjq7@HH`$9~qSU!(#Ycr-(Xxi+N{WVMFCi>@3t?Fygk>KvR%%}b=BANPKW;|j{Q+jM z;UZc-Bq@1Ku_YJ2476JY`CBTtRV`}kah9lSY93*3FlC^#((PeoBY@6UQ7UvcM2OC^ zLUgvO5S^_CN@vTcJ*^62O&&%6vA{Q7%O}y1^N-+Y2&mr8DNE7fWTGZs_leCC3ov>XO!Ji z?Qi+NwP-8{X$(=iG1izw7-FyfA`i+CHot6FJaJ>J!xOl13ZlYH zVbNGUNgyIsCN&~zf(>>*M8+!`BD)D8;)D=s6hfp4jEOWWaEgn@CXfP?PXq$DJ8l~! zCn?8lUP2W#w>>O_J$(kgx$R{hCxy?<0irzCtMP2dcT5zOqJ+bQDB*A+N;m?P-E3axkqVqi7mXbS zH)_n$K;VwSRVNYZK-Ox#lQ`CHInLiwc>!H#>19b}Q}vT)Mz0V%9=@2jbpLRI34?i0 zR4UASk`VKrEX2I02r=)epv-GOZBD}z_YbGz3EUY93j2rBT5)HR1R~O6QqQ9P;Vio! zB4;ZaBIgJpa;^{}=LsQlJ{S|ZK!HLMUG?gz`0@`UjJo{^45uQU7oq*MYkpSHzB>PR&G>$K3!g zh)ejyWKq{}qmf4bn-q=wHw%&f79sNADn$O2s~tevM->Sf;ju9aJWct>K{DaMe2B zQpYrp)22@0iRoi%C)CuJ*z;S%Ry*ua&X?7Gtl|Rtdl=whpoc-_BYX85FtG37l?M)9 zx&M%Us|;Fs@ZdOPm4Sm+8Pb37;K2;vLLJ+e9um3FRCvcA`h}vJUclN0%@?DvW!V3@K8y6NN@?`8_KQ=I<*S z<{t=Q{-F@&9|>XpF(`$usJ8rx0&~-k;-}03l^ zR`xUHKt#eMR*8m|elZfr^Q)qf=Qknp{4PYEKZMBhCm2`rzwpE@>~B2GjqK*7(L%A7 z(zscOgo5NwC`2u7R=X1lvndr6W*0(X4j~je3Zc*mj45ZTtEoT1%=RDNC?e^L0R6U#qx{bkDkSg zaviwEa7AeobTu6fy*SxYuDB;!j+);RRwne9R5bLL5<-7zA@r9KLVsCMTDIx!%PBB7 zy@_VX75j7n*yj>gjWA>{4HZ8LH5%2OM#;o^u8#Cqsafo z4t*aknG9-qmz+c2&!V15ZP(kM5E*QM5FrK%5n_-KAqEQ(Vr5~$9QsuhGC426!tuAT zA^80q`Ycz0Th;u2ZRfJs*B` z%NXiwD56`@eE2m9re3TCFlQ9k=EJX}#K^a<5c$>phP7n#BWGU zJRyD~Jb~L-L9|P~CB!*wq8ze$siwt@_)RT2%r;XT%!UfF$S@&dZZ3rB7GPT8TPobY zCB(&SMHsRV2Ld+&7a~@NMa}n3;gtBTEy*^iBq?sul=y8e8g7+bh}(8TxNR?l+YUmw z?Fgp1jl>^MiQfrN;C5CJYSB7@(C}^-!ZdtcWpR`6b+fng^;;I2$?H|khuz!K4(+MakT<-Q!e%z(xAI*fxumdE8T@$ z#NKqLsoCL+{`Hpd2A?pczVuX+8!Z;LH*q1hHw$5Vix9TA3SoO2m{#5G_~S3gci;)! zoeDyCS279QzS5V4{c1L|Zny`sZ7$n`NoF?fxu+&HGr_rfthEq7sXLlEl-dz??c_Io zIETNj?ZT4TEbSX5Owv#DCUoK8-9O!@C}HxiF?V-iIO?3B`a-S4Z?o(h~?$ZiPPvUrn029ct;^j%LliQ@%J|DsP% z+o6|v$vhBxnF|qmMF^o+g%Fx7gwSiCo@gc)ZTofn@nhl*Jj}{c5W3hsdHML)8;N@h z63~>WiTa~oR&N_aq zMdw3VrTv0O%%_&>GoQ-a`E&Ci`4?PB@-Kx*{*@5PzZN3-H=yin3PkvC@kdXS@3>|W zD6Y)B6J~B-bDq}j$NfN2aFIO4#{AKEAkt5YMx>vGi1dpPk$x2-(r=)Q*;&T?U4glO zgZv+qgvtH{nBjyglZ6sVlm5xZON*ZP$ph|hOW$F6OYe<0i+PZARxTvzY(gZRU5KP} z2$8fSm^NM~{Lx5OXRcYkiYwz?jPa&Z=RRZWK$$CpGL=AjNh(3qk6u`(@imMVX}m{6rT`}o&<|nc@SSz(GXuu z2=T>*5MM$F@g>2S_)-e=hgVG>>$#=Lky^S85V&P=r?V246XR@NN-lU7Wvsw1zCd5i z%guvIx^f|vbQ7YI<%OtZ1tBWw4yu})W@*zs@JD@APp+A&g)2e+g+6K}ih_&eNvs?_ zaC#XJMCz?*M5+)XQXe5A^%WvgKTuY-otOJ7@L%bp22c{#9|#0)5H3o~hZ0GXaUT_r zcGG2SroxjzS6^ zDWu??gcQ6pD1F!#!Mi9hmlRQjA6<+B0#}WzDi)S2R>f7!k9OeNP;t&~tnoLZk)omE z(G~@rFDYmV@ECAXt$N|{5<|_LZs3rAu==zkzs-m872ymVRvD{Nbw|vOwJ3iK|E5t2Yx?N zyeC(I+sphzD%ZjEEk=q%vEzZ_a2Z50Vq9Vym4NIpg(OW68}DtUAjdw6=vXvtyf492 zhW&uR?T>52#s?@d!X79@*n@-!d$5p9N^PSO8p|D`G$luk4<#lZH9iavTXHFg`mf>9 zD1#%EK{hWfwHP!$(o)0gD8<3+Xd%WqMu?Ed3gLMinAZLA3iku1Q7I=7gy1IvY`TRD z4Xex|=6ir}%=lzWa!M*midr;ge5yr5?KCb#?Q|j3&JaTFOd-_H0@Kva#vhLvpM!@@ zxD*sBB^on6k1+i_Jm2Cd=K=*#&V@qCxkyMk7Yixp5>S1Q*y}a>Qeokk@nr;|g3AHc z`Qb(?5DipNG-iCIrM$|gG@FGr(_KxN=v`xR(7RRv(7R3uz3YY0yFm!O8^JWan-uQp zMS0##5cF;VSZ{|L(G!hQ^lr11xBHYOcGS3o7?HfwQb6)91wis{Atdh+Lh@cAB<};$ zB=1*vsU0;QAOfln0<3Jqji`!JDXI@!%13<4mV?`m5-gsNSu{K!R{%Vp5W@3GAv~WF z!t-e`&GQ+B7Y%MdODH6t16V_b8<7;5G|9rj?H4Tli>dTU9}^F5zhu!+eVGeUeMJb> zSA|fWEQIQ7V7mIhjz1Z-z{9A8f~fvW`;L)aleLeA?T%15p#2sJso^3x<2KHS`ir+! zN;01Pj*&#*cNLDn?+Fq3eIWvWAVlB~K?F|5vp-Tqu5IZ)CLQMb1YoTZE;`AFBENwb zizWMGd}gUW_o*reF*G`2EPG(Y&(Cl`lPO9ZCTIIu@C}yr_|Y(^Mn-j1R(!4;2NMykq?2l_^UHIr)hub*5rn+`C+e>iVR9$T@x?$&CYY1b4RDEqzEfIUz zv3M0_Yg3$U$uYXQjxq2sd+3EdfM!%BTWhd=hi$E)r4U=#W*nKVw6(_wZS674Z&OjG zWwJ;Hm0E4VQB_~l(A-GgEyc@as_SY=hm-~1NWMUWah1xqu=$s!UTprAQepG2h1mQX zAvXV3h|RwPW%GEKi|-Y|)cODHGL3fm0R_?+egv5OgR9068cTKGH-_+o&d-+W7oWAs7I>=}K~`PEWj&)>L^J%1Ns&p(9N^G_l6{0mHXT7Tn@-s3y0AWE~~s?XY-K5J;S z&5yQHa8>nlDw z&4#lg+|5ef)JaLjPl6V8ayBa%8D>{1WSB#U3>}5Y&`F34ok7*fPI?)bQ-Qe|!nTa8 zvD91uXVK!yQlSXam02p)bIoH3=k*CIS44k}HBC)gwcXfQr*=Dny%RDyzk^MS9>mSZ zZLK!f`7KXWvw%{engxZZW+5S}Sy+f_76GN2&e4z8MHP{oS~81q7m_ayaKJ6DBo7%% z%7PAiNlUeqPgPl;dep_;A6xjdPf=A}V}p(!Y-M*C+S7RYH*GuNJ72%QLUrwU4)avU zTh@x|mZs=dRkw`sLUqe36{=fKi0U#zRM$m_>dHZ>t}IerS4HIh7Xo#oWYoVrz`4D+ zQhz9=wC&X&ezfdvse1TSsV*Y@(Xyw-qJ$N>kP=oBqJ&;Tl+as<5-PxS_s|D_{L!*6 zp1}1}5dA}6W?!}VXvwFzc=2oUSuT@F)>wtV0W#5##h**VPHyHoB(psyWKPw5 z{PO6%3Oac4^35dHhBO<HHADwFh$YiSenKxk7gL})W1 zgoX+sG)xGg%|ZQIGP!sdZh=3V%&;Zbf!hif9zNgU<{{q^TqxhIh2*=9kbJill5Zub ze8o)<+3mo%8`vIC;C4_DI$jqYhpjr@V0)HW{XV5e?{-vC*}PaM7K&=dNGlBDJ1H9C zI}0JcixA>fLWqw7Wg**9s2WdPGje#?kY7QtZgu7RXc9m}GA1;liZaIThQ?S$L!(v* zjl2*Vy9%LE2gWqUDR2ra-|LB|-ZTJ#8;?6hg1afVY+m9NR3m4%H~QPXxtq)b-DWOC zcY+YQ6NS*-T?pMtpv-MjW9~ihM=ynYa?J=Iu4q+Y?Wya{UBIp6Eq;kcqha8^Eng_^ zqi87ZD}>^HLMZMpgyI39G-|`Z2P!Z(Eo2VjPIP@R5V%8d5h@=tl%%FojTXh33j0n!7dUa*u_Ew zy988|G5yeFF2x@;naj8i+~v69x)^G2tpZ#@8Zr@)M9ERxxY9C!%T8%TmmZv+B&6RsLTNJZRRZv;2nEw}hvD$iHf-`*2Xr}#$I zz88>bd+BhuLKh{MZe_QbEGYSQr9#Pf2vPE#LX>=$5GCIYO3Ai6);)OQR(3BQHv3l) z=AOc`_4`Qz5h*dTcGRREu=^qMprRr2kPspd3nB7|5F(F)F_FgnBQuT|X6K*UyC5^>ZP1{Q{I-?RUtRc;Y_cD?EYwT0vo- zP+BMM8z(`VrOgul!K<-fTQE{+A{XC!ywwQW^ zc@>zO$>f|5Qq+<80X7W7Reul)FZ&et2W>1GzDLSK+ z5PwLiz5RffO%GBy~6HY?iY- zC_bZTiti$%_;Mk|cNJ26H_#VP-CbUREoLaKKp0i0JHVc4xJ5*I>aJ{FR0}$k744Rl z{4Ksi>17^h_2xpfDumGLBZO98A+-8|>QGENnDxgWe~ul1hf^{Xgi^Xv`PxzE+#u4E zqgW;SirV^M%M4;GD;i>}2q88^2(hdXVylAEmmO@mngVm}X0STRQRNx{+mzv|6^67V zlh0*TK>qro>C$A`a%4OglNnM!i6itxMHP)jw;r}7nPbMwG^3ogWaOCh|s62g19 z5Z)s|RU|Vz)VIbTJ(;%Qnln6bRgb!$;x@Y$r_;8`PLzsk(RP*YDXcg zMhaoI6DVzVkv4Z$pg-=l?ecdaF^a1KIO79XiVI0ep13Cu=Zc55soK)#eEQ0@!rJst zx=2?;W|3lxKL3rjlF-B$r9u;9g=nHyh$iwvG_flvO>~te>J*rpKJ>afr_XeHKl{Jk+9~d>9uJ;cy|M9U(-tBZY`^6qroKJQ^Qk zWw@G($%D58o7wZwZ*wN*{F;e*EcX@6#5|6Ga3<#QTr#?5IhUM?d7?$7XJVd2h_rsP z5D`uhBEqRcL^w@|2&W4RW@4V9kjZ%gW{PKGo{8Vj#5{{D2FT1m#EuPSW=U$zekgS~ zR3FZ|tZHr=t1qjex2dUa^?p;Fnt2ZSV;YH`o|<{C6^mf!DPsPjshQ^!Of|Ux2;7CZ zHZ}7iB}V#-g-Cyi5a}-!lF8>bOkYY2cbSruoSAt!G4agIEARyFN(IrFI>yF#SLyz2 zUP@~*G4pCm46ADt2dis^*y=hVB3>_q~0~%P+Q%z#E9v0mI9{FD*&c12x0o75T-8)Vfr$dX8MZ4{S?T; zoL?mZs*{1hy@nf66{S*CU$>NR_>}h5(OQywlMqpS%VMDTwgRB|ju49P3ZeL(5Q^`E zX^I~x+<#;AIeth0)II{(jvSQT*IeK=BI&K=Df<6u%Ne z@oOOzzX8(}zg2jtiKO2V0oCt;!2N(5Q5B_9RDZOTKlzj`CzAe5uz3Dr(eV6L0r31y z2+!Yz@ccsv&p*L5&%YF2G?DagLLu3K-3OTYgd33*nKa45iKMey`q@(HlO8diNIJVk zLv;==M75(3s-1*T?JR`qoM5`Wmf??oxy*%!*+&YZy=G{yLu;DGHZbvuBS)-L*DqgY zTaBx2Y~-hLV}+ZC#I#6}WHRY?+%f}BVe`)uH?Imw=9125Jdt^Rg(LFfB52cpAFkG_caS2Pcq)%ntuUAZZe#}x9 z3+<)35bb4z&|X#u?d62f&VXrCb-^Eh7%#`ev6BkIRPQtUp!NANtxZK~{o|@vc-qo7 zStdOzW8=}$78%hFetsrZZB4FMIE0~BpG?(w4tdk4hRu{MILab?7&K<88XFs`YZ?3q zPi4~xNIa!h?+g_gii(ry zDn-J3%}h!itrxzBN$s9&LD7Z8b?g`djjFA;$;W<@CDPFkpxaOhHp8l-AeWT6%o_ew zL1s?-;VmP@B;@L<#u`m}W~yR&J+qn13)RqrZl|`sx~@5g9$^wHw|5~&_JJBx;qULI zOnOy~sxI%@t1zo7oir6!A>?4zHdD98)UcM%%%myM&bF|mEIVDTik&Y)Rz?vc@?f-y zCu#^qC#eh^*jF1}X8I4zjCGBL6UJ=(4++NA);DX6PX+kBHLP+{WV(7*InzpQu288% zt9F+%2XSCw-@ch%nW1Eezh7ah;o&?`xT@0h^|GoNGM}58>sv!@eXeG-=7rYOO+v7O zPpi?$XU|mqEU@m{Q}->YMYq93Ro_EYjjt`WgG)uB<)-aRY^JPm7F*jg)%)$lm_=`o zyeWPM{GUivQRceQ-}AK9V}{?~;qx#W(_P*k20U0+P&5yg?m`|cJ%l`1dJ1{4tO)9P zXu~@z;fcp{d*KOOZw2vGNv5<_5JI_n=p^MvgSmYyIpy|MH0AaaQf_}C{%A_ux?BftJzRMBeAhP*`EJ04^4(BKz8eY2cVi*>ZUQP_ zantXVO~Lrdy&0as4OI|2-h#CaVK-VZr7hj`lBYqs!=1ttVH%&!(KBsopU2bu4E`t2 z-6=e4-7x7ro0kcb>KZkZ%}w)IaSKIb#Vv(caVsHK94^F)BS2NxGMR8|JaIGG1`i{% z3c`fTCBJK1GojNyTriUD6Gl-3+Rie9(e{dl(GEfw?I?uNNFj`N0%JxyD=^ot(sv;# zO{)rER2H|rw5wG{HZOS#8ePtEs_{Ab#xdGF2r-5W2{BfP5Vb;t$O{o-S5S?^bb)5; z@J9oZ)F_ctM zl9nDlQVy}4pmeCBp>&uKN{0)fbc7H}M}je>qZH`JMcOR>Xwp)(j{yRAEN;7rAE#2X zd5K)`P&wYRI>BePm# z6~*lf9x9QT|Fx7%+4N{B?kv=d9c0U-Rz}aCv&{yW^BhHE&U1yB^E@HuJYR@8F9205 z=h5@$LIvjjGhD0V9Mi>c7ola^^Tj~mF2U8KDzv6rQ0tGXOYN4+{4JF?(sxbOFv&Cz zjkG=-GA%p30rv zM^(8C2;AMc(p~3th7be4Da62Ufikd7?Ry(f+_SucCvfj7 zh??D{JsNWFks3}?Zc^!@?&N*T3Qiv=8crVy;q;LZP9F>5^a&Vq`c#2_qF9?2a-Wfy z`tUgrxG!+qPyI`klg&%&f{x=W%j;{Om+v^fF%N=#%Y_8_PKY4i3lZc8A%gq}s^c(y z(13ozA9Wl*bIr$KTydP)R*n1$FNjO{#E?<%@tcuG{@)di{C^0M|4$+E|0P8Jzd;$& zPI2zQ>OBlOvq?G&w5T$(0)d+iS6xUbzHHQb7c#ruGKas#PAw}~AyM+%z)Z6WAj7zS zN2p`u(mhBglM5qvRw|4p+P00OrpZu_Y( zrE;=)NnOx`ENyu$TobP*y*xe!6Rg6cs`AM_yI@JBt!@?5jI z25#JgOwHG(8TxptaNXeraS5LoGU`Ek7-{71sc7V1QHcC236Z~-5czw9GNjGGu2A62 zcN}6LXi;VQ0_-hG?f zhd6@owRU^_WxBedzNxCVzR`a*4|hFchD2kgd$``Zdq$tKyN|D$RM$|I>t5nW#Xap~ zZh4r#JX=28?v~ z5J>T=A4&01=eVZbLGf!Tn&Q_MQv5nXieFbq@#}%Ucsi8z71(0+%Lar|p*I8qw-Ig; zk&Sg%HZQ6LUEL;j%clMo-_>nq9%v2aLbQenp|!aXT3ZOAwI!&o&ZL9cR`}yNWW(_U zZiIqR%Atu;{^u>hZ4D`COZ3DjQAf9pF-H1r6^-=TJ3!KJCq(+~g-E{xD5G@K53L;) zn47u890?~X#ZCYRY2m7u3uTved_4$PUhHD2s(h--1u<94qYcaUbfbuFRdLmJFN(`4 z6^g47qPWpQ6gNhQ;>LnfoE^4YtH4}q1?GuGgk6Ea)!|BnkcAj~5yJI1<1AIZPvxs} zgL&XIo(pl>O$a9^gj1ssPEDYyvegOf*^ED~$`kN#=$3-0${BQ1vd=6}`b)PviOEis zimTWp%L!I{C>mCK3SqUE5LST@R(pfeR8Lj0eH7>i<=ZTNU(%wt{Q$Nl#+BYePLifT zZwFYa1AQv5w}Z?B!-KgH!$X8HJX8q7!-OzA9F*QnP)HtuKi1okcmj8ng3z1lRQ&iT zj~*NDXrjqLB#Je4jNJ>5V-*dLp9gzz{Kl%`garcP3zuTv!oJegQ@a|#f+ zQ*ou6kcAi*=;ky_b-GXGb#sP!;B+Pz;&he}PG<|@bdC^C=YrCWi3Y9n@JDZg=W`vn z3vi{HC9O)e_Q-S>l8k)BrC3E5Ssu{2SkchALw2nNnondXUoD>T-R9oYkm644G@lpefg9g^5rca?&Z;Q+};HukGqa6 zBZbBf^Qhy#-pWG}Hz*Z~xKW5AZW5x1n}sOi7Ep?)P+hrIf&KuB=|u82aztsj1A)5( zS4s<+OEac4y-yY@?M_R7mrq~G8)Sz7QA>9qcUvk%y@v~ldan>s?-L^G{X#^20F{WYqZDy^LFP8{!W^0(Za45EeaklaUotW z3*q~U5WcSp;Wrsf7IwXckC8cCE$jk1#I?Eyvn2hpp^AdlL*YEao@2|kw(AYt!mD64ROB`iZs$}iv?i6 zS$eqrt~j{;A;h463K8@#Azc3k)As7Xj<2+sISa~}g+Rog6<~l2H>yt}XH6#`t^u3f zlFX4xk|Gza0qbbdkn6;S$aNM%ZcZWO%7l=c3rv%n8-Kh8Y#uy;n^!?7Mn96GdgJCJ zQ1yF$i=?0h6hJ`>3MptIAq6cgq@YDWJy}Ix{l=og@W51mhGC;yj4+h2IKXzYxRDY> z1SJ%${aVseF6C2tg5f?>ZfOEVa2bn);IayU;BrC;W`q#zB7|T$m?qd&;UU2&({6-8 zaCv|+A>4?dh?FAO-BR}ODO;{p>PfIDu4vIvTuA{?>?MR^Zy^*bgi!1QrYZJSc+py= zeuP4@KM=S9xDiQ_DMfOir5xl_`W1Pp=I;g*A(|^&0%)$H0B8;oLNhCb=Bh$yt_G%Q zuCDNKsb4zdH3*03nn2*z!i|WEP${BoTgr8O%F6kuk1cv8w=Qwwx}K$h>-q|S>jpx& zZYYH7Mnbr545qnmqVQbFyf-BZx|;#a0mhB!idHGQ!z|_IK4s;+&@JpY-4;ZN?Ut4V zwp%Fxw!?+69U+A6)@q|R-{Ui-N91s=u=uvO*(Zq zl3)?t$)X{;vjQNxix8q!LWqtMLbMu86U`~y*VI(DHH1QPG!VEkxDiQ_Ns}yGRX5hs z*QU}Z51V*ZUEZRhx+@o=S|^0+I3ZN)g-~q((>>sL{PEAB-S7m?DTp3WvxSGJ&mJyu zLPH~I>E^_dMRhxJ#|&6h7eB~dlgdff)ioPaq@JK~q@E~5>fMD%JxPevdw@uttgG8o z5q?T?TO#g7Qp^?rf!iAw-Q+{Lr7$d)9MiCmrP|l0s{9dsj2O$L^XR(`t5Fyn^ec<} z`2?EIRqbk6*u!9GreSRv%*JknAftFZpG+D=It5^~16Lx2d?bMvDcsimG)r~5Pi4PAeAkm+wt9xe zLibEAME5Kqbk7z-_Z%T~&jr(c;d%Ju#V_aMVf;fu^o7q&XsBtL&Dh?Ez0=wXTRdlHiVqY@J-SwZP)dWQZ6OS>eGxaRy57%5+Tj#QX$RgG9k_Aa!{?_ru$rh zC;seoC7!@tr6Af+vPkc0LMT^FEGako=5&oEr`&55O}W9}$x8qeAk1Oh~?ugUVOj^keb~ zFz%wVHrx6oJaJWf8BgF|Q4nfaVoGXouaXKb(pxO5>X}J1p@aTZrfDfSH4X40t%|>2bRZ&J`Z1= zJ~9u)KjuQjKM_LwQz67Z6GHrRP}Rxgr#gLsKN|J_lIy^Ig)458P~-os&bY5(0ZoaT zm?;`d|HddH?YD|X+V6x&`@Ilpe-I+=kD$ynw_46m3e5eF<@y;CRD)lD!2ODgs`H_+ z(!UwH-K zMCKGiq)Z5rxr7jz8;ps}qrei|gC~W~OA1UhAHbj=ZW|;QP>ziD0R_!;LCatvpMh_t z3!4YZi*O;ziwdEbtd#`m$#f(qg@EYH_K5~)w@o^Tc%r{ys*d$K;XLL zs?mg;rH$4bO%J=Jr@y6gGj!GV3+oiL+2SSDtw_e`t#m_K$x20Uy_5>Q^%kPH3L$#y zBSdd~LFvu*LhpwsZYcfnFtDj0Osy%?ZPIrGNew4Sp4c*KGlMKEI1N@boK_aXX%!)y zh6v%51!GRDDzLp19#)4`IfYfc@Sh>E+oi$ zLIhb~h#(sX5oAM9Ey?sjOWFv3)RH#lnxlnq#gVTMQ))?tws)Iy7ukwhqUNZ{Y-U-) zZm6PRH%th-&4sYrLI}Gp!C1{(DbODV((XFwhI13@9svYyYh1OBkeuXey=`n`w`}Wg zsjNl%wtsU?iPu#8&T^HMiuOu3ob8Mf+S^{K(B2M0w6~)W?Tr+oy`4a5Z&5wocg7Pp zoL%q)u1Y~+!)a4CH;UA7l3EgrMh&OhvVv1i(Qv8}!fCV+PGf{{8VkmpY84o+HE8Si ztjm)aOYRCVn+Ui4)W@luY+h0qG@N?NtHI~x8_sz1Ajoc9NDwDPkVYYbGzk%;8C1hD zeW2e7_@jn1k?X+ijw_CuLNR?RhMPo|lquec4Wd@Hhm{BQJrxc0y@XH?gizmG2=#ry z*arJ5&`+V5P9*muM+~(;5V!+y)#O6v(oE}3?m)ZcAb(3`4SGuk2wEF(m;&kc4l=ld zDG{}nZf=Jd9n^ZLQlZwvgsAm!A!4;}s336NGR&Q3$7#gm5|;j5(d6K;PWjF8@>#W5v^ez@3iUe(Gna zoNQiF7c{psEw8hDUcR}VZ5{+UhYJaEt`I@a6C%j@LIk-0RC6A2qj&xDMRK zxZ=3Zl$%>SD}}p+>?lv16a7a`?NTcX+LtLB+LsHVeT5L(R|=th6&UOPY6a$|7r|@D z4Fg>Z1nxRqHM5YlG}3xAyWVcO!QWC@hrZe#Wt&1Xo7$1J8z~sgmTqk~87nk0U*{ z={_Nx?ia%80U?|o1Y=GQDbTmJw#$E*#2E7tAaIZ3wx9ZADkqzl)CH~Wam(uopOWLYmM)$H63Hw(R4f|Jxu%9f1{cA$lzYfM`cte4?>CE#@GR0hP0nGWrRoe^6OFzYJ zuZ<-r?^sUn`kZXj-DnX)na(nC?-7GyN{>drZ?~bC50nbUd?-XQ9|=*+$3hhI2`I%Z z8!d$Rlz_P1e1?Z@eHDaZ3l>6rK_JD8Wn!18d3pb_FwFlU;Qn8gnVc73 zfO!67H~fD7Fm9V}D}enT`YSu)az`Va1k6 zZjkQI<|TfMNsfapDU4QD9E?^GqV*v{#LEg{xGI=d>S_x272Aqf9Y6A}0dPPKE(EN8 zijr^C;rzz6EXmrbBq?6e{Kj=G8eZ#iAzteV;kCXHUKvTLBGDY5|-NYd^izk zV+6qX1a71aQ9>K>L`NplF!w2cpeMYIrQbG{KB;!`#3$_u(nFPKJ1)d_dm(Ih5W;px zA#6v2Y1Qn6Kc4usGoHZhq9AmWjh^?>fUw_~)~{^jTX?^fS?V~3-J8er(o?JL#WP#i z*Y2LF8Q)Mnw!&4B4Qdg6=0t5vW;0+;lvT4)Dk7N(Zfa8YJH)P^+dD}K0~Yn-L3_o-6fh8qZpwU=)p;do1q zgu5vf5;`FgHVTojNr;5apd^fE4oy%*`up%i0wB9Pz=n6YA{!PiZk}woaBB}swWm*I z4cS{)(@wNVLhWWRi-lXjg}Ci4gxfwsxa}*1+kRlWChm_v`b>NP*MU0_*S8V!J;*%d zdoUNu_YfiZ9x5c?!-V8}IH>k0vTBbUx%~ zZSy~Dls?>ExN&Slb6rkbP>*N#b7qEwvnG6WMcIs9^IhhSmN=|Y608+fi0I4lF(whp zIabjq=QttCIbMizP7tD;6G2so&eF_Dc;Z*Wlko)Z6a}H0qAyXgYTT(LfrwO@5Q$z8 zPqX_Wa=M}+a)uBhX9^*5mJlLmgE5hF6jHDxJ^`wt z*c_E7@x(pNQ+NXRw1SYd;K%1P1X8qgkrW;EEzjB=6#bl{Df)RKMZX}V=of_){Sp`# z{jvgE{P=u@FzUvuK;S0h77=+(cV+XUTF`&IZnwPQZ}I)do92PmTU?0N+d^o)BZStw zLTJ4Qs{b(QXg%-ak6*n$z!SI+6@*eYPs~5PtnNM{Z%UU0iEg9z|FIQ}5T7U-AwCr% z#AiZ;_*{q(Ux3o>Tx$PcDlj)g*nUOUnCNSOm0`H3B_E0)U3sg7(_z20RNwhj-YVal z2Z4UzLIV9LM4+F92=ucMfqnsH71Ikc{fa+olfQ8txZiPQ6wRiJT267R`GZtsBPxk{ zqgL~$WdWPN6b+ldg|O++8-&d)LfFg-##MJVJaMa;9S<`_6a<$}2^ZIqFiIBLq~xg4 zbg~;LxwBGH@|;3SE)!DnTtZ5o8;nbyM}fJ5QsyNHgUkmo7X-H@jRkZMlRtohCbOX3 zv5>#R8)sqjKxz>#L~2nXq!trGYH=Z?mH=fOlMUl6i9dSeF2yyIKXAol0Tfbflx2wJ zc2P)F6V>@;?N(SUr)XGYgs|u$ghja!7F|K9W?t3#|Hs~2z}Hc9|NpoIcZW-mw$P?t zXwc$TtP}#JK$@F2xui*%BrSz!ad&rjcXxO9;_mLw|NS|$v%5FBY17j3<@x`fzS8;Z zoSB{ZoO5PocjwN|E-zuegZfq=5hJY#usnkhYK54D_)hGiQ}p>m{|Fe~lI?2cb@S!f zMQHe?z+=;1zO3Hpu92%QlYyL)p`g~twM+@J;8K>rx!84{y?Y+9%i_vYi&$c zW>4}x*%dU;(}$Cb=6U)ei066waTvM&R(#2Mo&lDWo#$BviA=w$5IqJ8(W6p`9;*q_ zV|8KCJkJ`EOehHORWi@BCUHN{vld6Zac1#>RplsKJf)IVJzhK7%?%_~CwkVg zQsB9+5>{w8(X$?6+QIrj5glWWVz0U_R7hn()@U>Bv!$H@zpa!8zpaHhVTcfAw-Lg3D44bJwvy-D z)wCUAj8FwcZhJ!LSmPBzKSac{KRZ~KVVNu$dSUiwM@xp@a1KOoCn5B97D8_qA@r)j zEWHuL!|YED$C1ku$~GEBV^_0GoU`dlBQ1?;MoB<5bwaAC7g9|@NHx2H8kBfvLf34;Yh0}FI8<1@zc@0Q7*w!dV?$5}Ewn>i5A79l)ah436Jgy%Rg zYmVKChv)3^9P>R{!oW;*GhMS2mYD|AHJLu<_Eb&&j@#x9j0E~blB3UFLiE{Nh(7xW z(Pv*UtIvMKlV#xh6Jg>&BK*4!S`@w4#!MA2a@DX$S9MFZ-tDLkFML&$ZPCcv0^^$8 zuFblwu1+@pDsu-?9FCT;xQfKQ!=?Qos|(%-D;eI02;qIG5Z;Fg;e9v=?@eb=V>yCI za%n%3NaT)^2-00AgS0!Elb|NGQ)=Pbe~gs~wPTeGwc~_PJ6;I26NFGZ5lpC^Bw>E? zXq?PBH1tz|$el_!*@~Q|S}O}OMbX{E=~mnskW*4aYTI!B0F=L%8l zJWxHT6<+|ql%MrP5>Ja`LXUuJlX&u4Kly%`9%Ch)f%F5i}+UDl!QTClaO@{ew%!hT& z4Y8Ljay{ukErj_d(rR^}{q%a;yP3Ie6`4<$P5vB--UIXhIyc`Ia_4w!bhp-e2hVCZ zs&zCkR-r0ynX1F<#h`KZEp@q;ae94}m%bdcd#evf z@VcD{Qy>!2k&ecklm2PDi+ zUO$L{F7gl%xrYghDLkV5l?5>@8dDy%{EzwkeoT4XA`p6l0}*;s2%)Eh5PDh&p=Usi zDW(^ko+X|<#6L$Qa?eYIE$(AbiSGm|bN{tn&b@#-C@iC;jts-!i>51fdr8UI?PVc$ zdqs%dCJ3?HtDqcdA1HcF!uqM&XH(S1r) zaFIUko5g3w1C>5kGAex`M5Ql z5=kyDvk{5h>=I!Zt*)LrhH+&S32_-dB_6I$b69=&bWY`h_*_DW&n<-bJVJ=i3ns+p zlhCiOo=PO=r$k!m0zl*zB%I1dSV)X33o>%i^>JaVa1mdjZ{~|y1d}YrflRWv5R)t+ z#3V}!G09S(nz>n)F=}bzVT@Xam!p=`xS`U6(cTw)ky zx?4#-d`VS<=}aYlVbTUFQ}(lxtDt18UHWdbr&Wu!dnp&z?k&XHeS}!MuMlhZ17+>G z!`)_o1j&FffC!sXNkkJW`t4{{gj6prQ)h=RJa5Cws1|jr_3V`O{VBd%ZD0{-ZODOWZ6t)&#zJUq zB81kapt_Z52eZwHhi)~PW9It^MPxqfz&A0sXasI+0tr*_*P1W_|`&* z4-rCq8zIDpg0km4n)TRL!u-^uxEM?^I#h})*!C<5kVK7PvgE}D$>V?!<0E;Tz zRSEfQ`3*=g&}e|Kv=YidzS4q7nKf(;X_I9cja2gc!fqy~ZpVSRGz;O_B7|eB z5Kd#k^!J5v#Mp(3P`@u|lEv$t>sr&mA{vb|UeK+stA0!vPtKwr6ZSw5|Cq2RhpaBL zvTPbzRue(naWgV`_LqdckjPql3t_yE5XSooVZ5IZ#`_Cjwg*=u61ukgY2$FjG^ry1R#Fk#Pa8)mGuAy? zh;@$NnB66W z+1)~z-6MqAy~5U0c775LiRl&WZxG;_5(0W_Cv}2#++@-{)i;# zehe`0K^W+YRw=rlTF%dWPNUmq2zH;7Cc0l(9_W540d&6-LicMSbiWZo_ggSa_dCfw z-L_?aPZD&00C?YpFwhmPQgnZ^oIm@V))0y=5bhUJMD|z90omUqfb8!=$o?UO?4Lr& z{sm^qPS+E;ZwSRDPfr3=X8_ohm@rTkrBYO9vYa#foK6bXLm%)7d0| z>Fh$7mI+}xhY+T7f?1|>N$$6jEh>0!?0PTf^&|X9c?L~#qUJT6AUR-j&b^k=FS%O?Bu_VC0#e_i#ku9af(w1`> zpVKy!PA=*$hg6)GwNyBlO91EPgm7M72b^};yLKrBD zN-2sfTh8u2r!|P|jfv|)f>>5q23Yo#0G7Rkud}X7NkISOCWMv5eBj%l_l#RsKR?ITU-7inf!ZdBwD-fEiQWc@|Ngs zW697R%7N%^D}?TLLg-crp}Repy|(W_ysJIA4C5$rJ6hb|s;OqyFl>dDrs5igit5&U zeTy5e!sBIEJ6WZ$+*v|c?;=E-Y9ZQ;5W>C&OdpH##CR)(P>)4RL(__Gx8N%IBEhnH zI2uX*qKBhV2;zsMIu0XOZzX1JP>9*uGg85lv(HGoB9W0BgwP)?gnpwC`b|RUj}aEF zw%SdS2?ascD~`B-NNVONaxE73lM?Z*t5-GtT`YcVDZ2ioUnhuDZ8p`8ySY{h?pz;YKtduZ8HnNjyYLe!0fsJoYtLO!z*A~lG5l`;EPbR{)wi00w-6CXLfIF204F{)L1}ZyU0xCO0NM&aV zsq8Evm7NW0^pXm?{XR$N2il^7&qasSu`@31ND<5T;jvS*BM?Uh1~%DiWZ2HNbig!a!A&N>RPma$e_i8r9-A z8LuZrRBx~xP`yzCsNN)m>diu^-XetRtzeewZIYLIlks*Epn3T_VWQ#?;RSuXGb5x%W0 z5uKtRRvBE|QrDEXy~{_|w$#*VWy+XZH@d!AuUE2xx@#J(B{xj|@BwT$ww8%F_Ywur z6-1ngT0i0!!bI)MRys^yQ8G*?2x0oF5T>sQVfs1<)AVJ?Hhve#pTwLm_7VNQjv~7Gma4K$$stBlA-w z_;;xObt-=bH(dBRz*8}yTo~Iy9`i1Ye;ohPa((4<*_4@Yk$O2ayeajyrDCRUIFOmX z6=J6EgqZ1jA!hmk%=Vifi6@IZeZ_|?)YjoP+39|+!P|}1 zqisYZ7+sCO12_0B4!-r0oIJ3E-vTP9(4DdZdo7^>$4*h7Y}n8Mu3 zUs(`CKWNAAL(gOR=k@s+w7CtN&ms_-p92wEKnS4)g%Dau2%&{R-G-T7+=DMdJiJ)2 zD94doj1V5a+{GxAXpFfv0)Hc$IW7=w4TlAttP$xzx!2&J8cP})TZrD`ytG(tlEZSi4Oh%7U~m8bR*2vL5hd`4Qwni=fCu97vIeg(&if5JespqR3;QMi8?H zo#=7mVFY=CW4@e6n2aEkGnqGSTbFwZUJ#e^sUyP(^0bjg|7Vnp{?7{0|2ZN0KQBc8 z7eG03ag87^N*IqI{~}Faf)-8YWgv2|5NZU8)t8Ujk06uSXncZ|^r|nZ>SpE!O1$r5 z@8xy4HH4Y`=3JL}`+zR?t>!Lcs>e4pRp+~u#aq$wc7F31e&DPv+tYq_D37z3SC$X) zpDZo!?i1oO%PW0GjgjT?Y)*4lXbGdo?;NMKO|oP?f#{@i^0}s+6@{z>uDr5$_wsS& zmAxWgukwd~mVI2C?7b{|?+&t8=SSB!wmHLB&^s#noh6O=Bg%`)+-vxdPEdN{`gL4j)N11P81zVtInnE!XF zITM^{6f*;nn}txLVywHoJnewcbYc`+DwrKPF^<{<^H#?~v+O5n^#cp#b7j~Od zh~4HAVz;@4*liwAb}QEfWnKyWmT>Lsn~y{km>-DT0)$c^CLz9Ffp~X-1ufS?K9_IE z3tI$Ai*O)HiwdE%m=H>f3!$_GsD^AU0#-{BPa5)4L?XAeL^R|a4Y}kHTb>TDZW%ID zoG7(#U^y!ZR?8|GR^>uiEhmK4@S$!AsVz;h9l42Vz(ugkeu140{P-*c+7HOi@VoA>K9oj@6e4d*@3Oe#h!> z5ego_feKzlNWrTLDR`ief-6B4EOOF*H89L$uFi4f)*zHWj+H;MS20~;+FZHHC*x|> zi7S+{O!TV67YktreVHI_0O3cWwTwDeSX;?hVUQ3jtRut<>k6^LdY~G>N;1LvM3O7c z21Fvap+wj~YXY-2a2t_8^|Dl2eYomuY-dsZCQ7FIO@&mynULxS3#oo{FsXhE3H>U; zqN=t;PFvdwh}_nMB?%4D*_8#+F1q?`W2X)Er}@UWtwo@>9S5RUC4}DgLg?)vgx)Yv zZN#+1Ksypo8sBgtk=se4(D-(?2nFxLfeNk`Qt${N1=k2EI1j2|k(1?X!O-|davZr) zgwk`Y4F*N+t+Q=y676hKZOqk)9A7IDBrDfK3#&JNs9I1ms_rU8)dnG|juxV7BPbVl zlb%gPk`^|G2=lTMp{Q2Pi&EOLoFfSWGDu1ww6SJ84+1SphCr(j0%L^`7$=0l?qEV- zyo7!oeVfYmAca=8C%{Z2VF#oll~7p_`J#5Vmz}t`Khd|deJldSeK`=t{e)25UkJqm zgit&XRC6#*G1EcB!vo;K95YErC_=+~@tqlVyv6YS&@ z{mE54s!bPR80)-A#|VZw$#P+slR1!KP7z|5Q-v7jG$DpL9h6~KmSN72Fz<_o?U_U) zcNU?X9x4ht+u7%|IomFD?dYCsxuAO<2cmnv5V{u#p?jeax)*_>+g)@o zmN2Dz3DL-1N|>c98VTKatDg8)@G?8$^7sVS=S&xMcUKU_tP2X-@x0RV!t*L6!}Dq( zJg*VL^I9Q1uLH%ihj?BuVZJJ^;09tC_eOvjD?&AexK=Uhfb7kd{}!J=aYpG|`&%s+ zG;iZTG;bF|^9~_2?-WAwE>JWpMDuP5Q*+)!lzAz_tT{y^VR!^8g|AG7R(hYEc7J@D z_AwZ$tpF?C1BfuJU+~#>3G#!MAI1+U7mObk!uSy(j2{)k_%Tq7dxZzo$Ccn;EsiUC z0tp6w5?~8?LK!%&UF?j0A-^;PXNVz959)i$Vy# z1VS*`6X0dy!8WgO%x3b0GO50x?AK}g*M@RkyQEj1F5Onk<(A708Q)lw8{Cwyb+2+3 z?8LWyyL`=xgx%{(hTR)N*u5!)-CIJ~y$#BIedO?WB=lcU?mUloISK2&2QU>tDC@@L zq@P(g*+0YHzWTuOe(3X>jkmUCZpqdWA6XJKKjuKRKM|tNr$W^EObGqY!So%eFNpC1 zE}`C$%3;ntFBgv=)6(%*N zvkEEXGrLbJrs8H(V#(K@W+x?i?Wv4NwDxk6;o!h+lG?(Ru(A>%b zp?QRudR`&g%_oH5{9x9S3rOyFMF_PlhzN}r0wT9CAvCN_ikKf7;#Z#*u`G*bvSg@* zSDzNMWT-99fv7DZgxZoqs4XRg+R|W_+A_q$3q?7Oc_EiD*d+F=D@UdUm&;ii)hsUo z)vO?-niYjq(?v)%T|wQ%iM;xFH=(ycD03x5SYTy<^>&280-}KhlKlpJFAnc&_OSdF znfz&EOI~{EY02>H#esPC7Q(ZS5T1R7@azX>&C#EDG7~X?2y5yjqKzy;8_B%%5<61w za%hL<3b!ix&{+IU6KSd5m5Fx0+dxb0 z?k#Lw%{vKWS~=kD6+biIoQoCZ#Q`%bQ}>$5uO+UR0ocY@Q~gS1huoSLEu?SG)iyTT zfXh2FJ%e9(U8cUdOm*_wLp3iPu;{Whc#9w23b37Sa$3<( zt!44cJiJ=dlGEqgR7QPceM^0HL;W81!jpf$scA$3E^Y%9Pg+2sji)v=tKg}PlnYO7 zEW}fr2=UaWLOit@C{HD?-3(Sj{{KC5ZjRnGy)A&qZAqx67u#4Z%{RUHm7c9E*VaCl z4Wzy!1~-J)dWKjI+^`J?a>Gy|ZrE0c8@3bThAJ>SGHg#gS=zk=k;n~`h>=0tp!?T) z;<2sm&eKVo<|pVKIf+IhzT7~?jU-GY47Up1E4X!mr zl8J;o5!Rqd1hsUN?HSIpCT!~DT0%TB#@N~Yd=A@vr7)Vr&YdKxy%3Xzf%Z0{!g_R4%E0qkztAtRzS_s8!giyQ| zl;!5s*m9kO`6(fDJ!fLy8-U2&NT`+^GnA(7TXMR~p*|ITlbv|8KhZ|?Hjit!SQ5l< zDh%w7R7#`R7%*MnY*XGmX+C7|6^tg5}g7|UmJ`N*y zzm-|?aqR(1%08|=h(uO@NC^3dg^+(l2>C~akbg{A^tkr8Bohh(+>|`wKSA6-u06>S zQw|m{dRz;N#*L_(dzw5n7}3u@u03O?Lhe~5%-8O5?K#A__IV(3FA&<}+KbAJ1}_QG z;AJ5iydtEKqQ|wEikqOsl8I3Lq4pUEqV~BEYF`MU_N5SNUx8U_UlR|HYu|9p906glN$gkm9Wq@-zqd51 z`9T7z`B6wUKMASkXCc-60%}wedG-2Vg~g9+zahc`zXMDK5C#i~1{UbxaqUmb|5qk| z+SroEwdwk*ICxIafq2d!gy)Pxc+Mn*=geT%9J3Hl9@l0i61mwVqK&k9T#Frqg7NY1pLKK}BMA7tdZ9XNmdt7U$)%;|` zOA7#O2S$h~3bCrPk8i5+N7f3`^U904Xl#t_-QRB@Zb2fwg`GB4WQ7* zQHz>UaMWVTg`*Z1;;1ErIBH2Dj#>(oqmrk!rInEXf6kiApf(LJ2QY<1sD>AtSnbR= zy!c_Q+;T1FbJ;NJyJ7G`cvxHBa^Qs(IFJ`s6yk+0LcGvbh!?tn*>Pbd;>p9>%0!r9 zl8A9(k`HT1ljdQq2Pe@+#FrbYxQ&E|wF)Z{c0H90yIw-r^%laej}Uf!LA4QkSnEe5 zxeM-3Bys~Jf?E2pwh9vJ74x*-a0|SuWvAYON~YdQA@!~%q~6tq)Vl_l)VrpH*@v~Y z5a6-3fyfOaET*uI@>dqb(EBcaSX<0-+5!5TOl)5ZXuxp^b$Q+62^P z#`NMcvnla#^Sc?xksC}X9us+3Oa0?ECpX23Qfj7fzq^GM1*M zmO9eTp!!itrusS|)z=HDz96LfT|r+xt)fA~HVWwj(k|XH^zNwWz)B zW~VrRif^yY7J*g^2cp#~gw|Lgw8jacwL7TxYTChUJn_(8_ux2kdlHID_F=7)j{6U% zQnvV|mJ5wHvT~ugmy)5lw-Ac^2%)&I5Q_VOvYb7v?Jr^R!&)cF9Ke~__dp@iX1LP!6Sqyc%%@8jsnw%wWEnKl|UHw z9~{LT?nHiB%jr?=Sn?M=svUGaBi zY}e+I?`q2nnQN2=nQMi(>^dQuT`z>(4Pe$IH%jiWj=qkY5TNVLK;&*Ago3qek@5pf z{J?jsWw|YrB||Jc@ZE075W9l|5xY|evAcv2yITmcd%!HQdx`@_=JqBuglL~t5dt6vzYr-dxV~i&O<`oEoF+>Ps zB+q`~(e!D{`HatLztU=%mUc?=UkPx}k|e6nSr({1F9B3v5JL4uAyi)yLiJ@ZOZ64W z{o1uQMNc3FvabS>dyO!V6{%8WU$>lZ_?)&&aniBen@Gj;ElY*x+Y-R@9U(m56~gm9 zAw1s)vpheL-0xDHmii$=D1HP)?qkA0QB+D%{KRs8>T}wrglUI&pCJ~<&n+2_Uq}GQ zFNJXYN(jfVg>d`^%yRrza=$5Irr7V0Lh^ecaz79Tk|I-z;+&F~+JAB`5}-Oa5V?5>165HfMRi`w zIiJtjcK^xw5sT*nmJH7YC4lEbLU=ALgy$kccrFTNc`hb-yZt8@M+(U$fXFRL7)Xjt zmSpk%lS^6tr8D`{D@roAvy3G}HOGOdE-Qp;xe%($38A_?m>v06AfC+atVkqsT_j@U z%W<8|{1k5^w*4HN?mt=Kx{{f(O(dtm4$J;3(M^S?(>p5}KXhGLa&+x3MAsfdbgdAg zYflhe)9IaFO7O26Oj5Dlh~?W7waw|?lKMfuXOqj>Xi&VXXOk=A4yDA_m0j6|u$z8U=NBZ~;Zj?eXvoti zYJEY;##LqP+}FZ)U-&L<&J5{azbnp7Ioeilr0#WcT`5Gr|JOIxG_>Yx^WDnE)wA~? zyJ|M=T5J1cvJ?2&`li-qUts(~U&#`!W;XznB+aAH#*wR-y>R5J%7r5b3UOqm5J#>i z#F49ma%3|7vxX8_2lzij$1ZkjViB6_T0rF1CRB5ct*_SUn`=BXG{|zT<8#^lmhZpW zojKRFRGhOO2XfB(LY%XK5a(oPgCPX5)sYHw@Ti~xP)6s(!Beu<9 z^_VdYY| z)yc>;C32m9%4BOJf}apLAm#)(@9apIOjoVb+`CvFX@ zhuJ3$hY(3-CAJ|FxuFu_!2x=9nj#OnZ7BkxY7r^XFo&_7l@C#EFD#hz^%9|9433LhLijh8tQI5I=>xvU#q)V1tb!U}fuA4ATLhJBIgrXD zg{VAAh{|vEsnJ z*f^^Y_Pa}fwZ;q4Y7Ze=?kPl#|9~Pd%ZPjghS{XOIF8)jgm5od(Uk=$ls3pPHMEaq zqP~5VOnv(asc(NF^&KFjz5_uuNSk&(NW%QIx5~lPL$f^uh}@xs8GWRrwLLvBJ|kC- z2);Ya@*nQ=S8a>$){S?zp1Nb6JAx|YwIi)6tay|JSn+5fRy;N{D<)OU)I`c4&6-)TbXI~|nQ%G5;8kT5?j?QteG z;IFd)=Aj5Pnn=A4{B@4yKiB848iv27<(1?->XFmVxB4*R1rlJy3xyc*A|Xb+ScnlX z0kclKlz4F3WgJKDaza$C+F_bfcUMpiU0&vD-zKg!4ybdLl2PYsA?jQsM4fAesB;~d zTw1P|Fh8w{-#{(2iyHx64a~pL3 z2$B8xKuc4*O}E3XPkp;x#dU+@i}1I5&GGG6(QX&vek^;BW_yO{?4rB63T=HI=A??s zXkT^vUA{}{QdG!jHeatFlkOYNV_Uss)s3}0{rF|g&9+;+zq8ccn;%Ns?$F-B{+Cm} zBYIF;_A8}F8=th>%sr-^OH>R6audzMac!1bWQsPsx|iJFzU?mS+EBR-kJMYXyS)E^ z18cr%2lB0KS>4d1hFf^QSxm0Hv9+P0ym+T{J)nk%Qx1Y{dlYl*o~s>I;m_}`Lb_Lv zs44H(y|}1qmb;HjS`d%MJQ=X=eN=5@t>42wT`tcwdsH`&R>RxEk4(|ud&)1;uk_iaIohlP9GPznM$C0(AxzeSz5Dg+r7ehZ zefs6bz{Ri~wmFu1x zOo7CE7n^=am~d%nP|xe-Ta3mszDtmdZS{?~UN0}yHjGEHuwjyIX&PpOiZ&w;dk6_9 zbECfOsh!(&D|^P2ZV_2F>CNb})lAmLblDUCF^yP&ax0fi?jK4&L*HiCQ|=#bS1#@! z?htbSaHo*_hr5K_Kim!K{-JMJihU1)AEf(|ecjSp0xx zr|t)pOx+I&srz9ebw47c?ngmiH}|uTNtj)P@;Cx+GoAq0*p0B5!c)p$SrEgbht{Vp z|1&aU}U~+G3+E>xZTbbnAp48m=+ZV3LHpex(?FU`xDDTPY zl?6F4ZLDFk>3y?1KKww*`0zs^KKw|C4?h;-!%sjp)&=FjPl+U*tkPER~Mj?KU^ z@B9*qVGnx7|60CH31@HIJ8t=ICM<`)}Q5o2!Cql(r}TKne5z^IJy~MN`FZl^B`cyc!U>)d_W-ik+$c)A4m`4LfB`e@fM% zj9i_YXDT^86lOw7%`KHYq4Zo$JfGy&f)%Z?^drF9Mw!+)NV#Z@>j-I$>k4U&>j`O% z>w{{IIo%0uKqMKpHzX3djU-}ZS)sGKyNx*mUNT+UOTy5-i4_O0O_dC<&4ln8EQHtQ zLU?TfCcL(kFh3a_w&DalzBLfJA%v5s!Zxa}vLFi-4dO$syls7Xeh}ZzA}CbFffU+a zh(bFEQD~SDg?0orh?`xo^>E^05Z{U8$n8uho+B`I$@VZ+8<5+D>fj@tQa^>!tlGGs z)(9n|R*ev~@_#JvW15r;$BYr;nB9ap#tCsuGbqQ{ z_P#Adl8)Uh0$ z6{6U2LKHh*h+-#z^3-y=G@K}5{-0CfBk;q*j5lyrEWSYrc$cfOCvC}3N27`;NROnr-WawQYgx;k>=v^j+-sNCI?+OX? zlTYPJ&ZDVZ1w`&@!YNYd8r5D|kXed`hHI_Z>wK|(Xt>@YsCNSgQtw6~>fIzny_zT?m^i9-_i2i9Z-U^^iDk+29G<9FRI_AWK_Rfi0bzU zQT<*as^167vt2ZJ+%IAN-=yRNFrv*o2t@87LJcpm=JHI(!^^{V$|L@is;lwaq<>qS z%-<6`_lw(<{%+_Vg*y%|J+eGzis9hLl?w+yA;iH?3UTmLLLB@wCTjx^%7U~m8aUpvvflP(`GMmdi=fE697vJ(geda95Jf%^qR5A! z1`e|a9q1$CVc__fP7|L00Z|1X5-|D_Q9zY?PV z*Pt9}8%}>C;lJ;@a^FIWCi5M@)-!|}LSpshqmGA=AMBJL{VD&A-NvUd2=cS( zg_D0#E}Z8lQ}t99q;=5< zGMAM#w=c_&AoExRMdsBxC^DZAMdlZx$O1wXSrF6+V)nqk3lR?^$if^)ZV|#{1o;YeHTopB@-|Uc9#joDbvGgHdL<$4dSy`UdcCl=sXKyX;Os#paupJB zZ&0*zNl%1SuO^aqt1v$HvNNc@x00#8kC5v73aP%Ikm~z`zIwXV014adT(Sx>+VrYG zXb0nZD@?qej_EL{l-GH-$aP^n+nl> zGf++$ps{YSg#WTn#cd8J8pRd>TN@K)=1(>QyxVma&;2Xlylf- zl3#19Co{!~Qu`)Wu##Z4tCC^WAcWOuA*>pOuxbKjsnukuF%ow2V{yBY7rQwia?OOY zTg*w?6xprCa<%$g-fm+p0>g0}h~e%+7>*aha1S92_XK4(QxuZ_A)eSRA`-d1B*JcL zQ{~|bl3Y35-Xv3iNVK=qK6WlV_Ej=G_7lQme<3^$5W?d?P?lOlmO4m6-=<1bcrdBh z<`96F#|UMcn1vV@+2%0Ib-2&vZF7W0;B+Jh;&hY{PDcyjbc_&A$AYqrsRpg%h=-fO z<2h!7AVQgDDQi*_`RJ-Uk(?AII_<4=k`)7^la&mkQ-m-&RS2WggfKcCl$F+!mCleb z--)` z9z_PTCa?U4;ro264_jQIT-f45A-1?kh%GJ_Vv9>a*s@HHJRj(DI>UBa?yZHYz)3~#X$Zf$ddjhpS9ahv6W;q4rV;T=L4-YJCPT|yY% z4T|CVVt9{)DZ_h-vT~d-%TP2DhDU^zZpHhB-EU_;;LoJ;|Q_faAI9s|?;!X78a6dj@V3)56vU9GF#xv^|YeZ{v{#oUltZ^8TN`K z6AA*%o@^O5fw{X7~*vR4otJv@+Y#Ekl8sBM8bPKT8IUlP_wd@vPZ&o#LS;b~X|oa7XOi_Ou%T_pAm`|y1M|pj6a9voYUtlvE$NQq=@9)mIGtV zBLO7m6+&`8AtdJ)LUI8xOL9TUOYOL{5D8FS7+_9^Fi;hxQdAeUoQwIKZFgK+9I<#V zVaf1ZQUZ7`C4}eFLU=ACgl7)S@?2K(b~`SWBZcI0K;)Ju3?xM+OR{*!r4=myikbXr z2Tpce>SD=I?aG0ub`wH%B_UK-7DBZZn@U*xvIWE_3fKlZQq!t5iRVQ&2nj8 z%^dAFg{dCV)XHu~TGHR@^!cG2+b;1cBi|F^jh1+)1ONIcYyVlC$&O4dN^Nbd->tPa zr-_vw^?6=`^{4Y@UotUcyVF?FaXETDRPmOkmgT+fF?vUT+royd>=85YIZ9KG=nFSB6tz39$kPr{8 zBg8}N3h~f-pgff9pR~Rb^8XLoa|0Bo@ofmO$dFKtFE+B;ns0pZHc1;>u1$O{yA=5@ znB696Q%l7Mn{gl?3>M;p&4u`23n4z(63h+*TMuj#JrPVd&(st@9h0JbgXP-n!MsN^uvX%;Fbc zo5r;8&9Lf*;&*r3|2o}V*VNj;OVGT0%pOg=(ad|c(q(jQOI=f&mv%e%V|Dh0(kcAm z8fA)p1uCt~7O{%FyYA}Q>P?%jP0o)SS)%`-YHk~v9OH{xI*--y_!4G^hgy52ZEve& z+V*xr+P1dRR@>fQNZZ~4)cCTn?rVk-NoIz3B*Mg%L^SO5t=FB9P_Np3T5p&Z-r2HK z?=DKF-fAKBju29BjgWftU{Y_bgxR-VMGj-}G*|>eqd5?vMj?cngb*4dgwSrFZc9urY~hH9w_ck$=9625@bKlfT7+`Pa-ed@ z2`P7XA?1!2Qtlq0$`v=+cuz1HJpMx@a*;&X_#Cd0aYyXLTd$KhR7|bm!R;kIDho16 z>i*E|_BKth%05cQD*Fnt%6>wuvcC|k901Dwwk!96M3QEA5D`A?B@rg+%zLDVkQYX> zWy&Zt$V06l7#*f$7#%Kz(Gfxz9Vvv-QDDO8XbC&_9_cY;rKuhZMD94k&eA?!byOCl zZ&4#Y!Ad&Om*gAUNftqglR1zQrwCEvR3S>7CPazTK{YnB1&!?t;$hnEOpf`E7oiyL zOOI2 zyBI1oj7tE%c20=d3$e=bg*m7UI%tgt+utAuhcRluPH+fO$QUWOTTJ2p>z6h(^3{ zho*5ikp&_$W!kpFpm4LD50P7x43S%f5V=hVk=un3xdTjy+$mvxVwK)S4qSdW5V?B@ zCqeRFl~`GjQbj|+eOAEzz5qW2JYW$hKgfY7KO}_m!$K%OB82jzpoRd`9P>R!JPZMk za~!!R2u17|toLtgLGDS&!Cn?f{T9ZAr;Is9cv{IA;Ta)DcvgrJo)cn(=Rx_+-qwCW z!u-Ee-523Ti+Kr%+{=U-Bw`!LTOAJ)uh=OQ{3%s8;mZ#0b^q@D?X(^;UPT2wUV6xQ z&Gf_LuPYZGe?y4J-xT8Uw}g27ZBQP!``CAgBtyo#L?ZW|MDdVO+EDI&vOq+JO`BdA zGCr{LA@ZS;A@Y$BA|DGO@`(^4pMnXI&m{CiMhBICP7WHt7eM5`B%B1vuT)}XK}r=3 z8DCog-}nOjknycWp!^*NqWrxO%0CF9{G$-cKYwR?@7#q^d8Nx=z-I4H@59lgkZm%GXxfY+Tu(W=XtY zb9RC*E8DuZc}!Cy+rn*N6MdCse5|}SnT=oy%})=oOSxt^w0TW3t=C$g&vj}xkB9tL zGB;NaD<9J0n5HZ5o*d*VDk^eGba<{uZnJpWaOlvD*XwNY$;3-#Zu8dBBiIkRM{XNU z9frxq%+yTr}|VaY19F1`Eo<*!fQel7eT$=_~$ z^SgCPmz8zt-LEhE+mq5_iT!r#%U?D_pS~pK`;P4ANFuA-txw;g62@_E&A5L3TlfR} z_HP+CE|f65jE_a)d3w{v>K^ST8D_U;L2oKkE_%}(LVDAjLVD9&LVDBOpn6mHumo)$ z1jztBFOkU2ClNzT(Gs-z5mLQcVOo6{k{7TusD42uQ~g3hs$W=0^@|9peo@d@&)~M0 zgl(3fEsl(Cvjo8B9SGYISxRSB7DTmZ*j?IAS;n8@huxe-ptURqqE#-0)^b8I|z=t3lNT_wUO`ki)?{mpeFH|2>_YOOHztz<<(Yh@)vtGf_dJ%rGz z5JIabC~GaIo9|u{`UTCCuD>^#F=HQq?=BE(^odDHA8)z%=Yf8ftG~}xH7^Q=E)qry zH-N+r^;yNvM4wfa3w;I((Wg>~KC21QXLV5e*e)Y$NSH5O-I}C9e=UH0_z6Wn<{-93 z^aok4b$qU>A<&-&Lz`Qd@;kJ^dR93WSYNrYzy?Aru%QqOY$U`28-udI((>pg66U8F z<4q|ZBW?!pu|h%_F;+u1D>CBdmTL>2t7n^`TzV3d(S0i~?HOTU|h`3`Gz zB%?$#z$7!Fl!$4FvsWTsDB5bd#`;|Tf-}w{klLLCks2?A)E+`e?J0!Re?VPu>;i!k zBI3yfXD=dburE>kn3QQU+@gfr6SogpC`3fsUuE{S^Wn0elHszy5H1G@;c}o5E(d`! z(28me2TSN5lRBvM5OQFnLxIR0MkpJ_OvJp%Mu%IjBYZAzqa!T>ucJ5+ucL+VIz|Yu zV}(bFJS(grO#oS5M2O%ld-rgr0 z8T2|u$>?>e5WP+lqSxs{^g08Sy}QcZXG)m=$22&L>TurKK;+ILl=EV>WK(lq`$d@N zTK@BVep}u*JUAw~6%BVc=UXo9Z~+Ih!-YcZaFGx@Tr9*6mw>W^y(f67gnqT&a0p&T zl#TBR#0l2D+A+M!a>4Lw4#e;pAq=k-!tgpF46g^p zu!lT#gM{gN!W)UQ+dN@ls0u|RVR%I8^@KOunYZ{e=@aeN6W(e`@VJcw@w#0I-#dix zy;BIkyTEik;oZbo_DHDpggI55KDZ8BTAtW;5!$QbEB82>-LdZWRg#6>eqUD57NHU=y!0O3z!Y7IQ<%Cah6uGA@ z?zh^Bzd#xkjeoLZHKEpztkJtyFMWA*Y^`gq^&fNWuEi{_CH_chZDT$@3bXnl!MP@9 z$KBjBRELjbiR|jbXN?7VKBt6b+O0l(9x)C11t4-S658s+my{V}yez~RuLv>51R;fd zW*?v|*2=xA#FC2-Un3=1eE2#M-hY;eKBHB3v02=kDxk6;^R-!f_?G2{(A!Fb&^toB z_O1}^-V;LbeK6~k4EUOV z47JZW5VbFaQ2SB{wXcLw`x?wr`-XV3^zd6Ek^4@f*eG!uao;1;&(c3w8uk1r0rmVO zq@JIJ)bopwdVU3UJra8j2)_x7mmdC(2owAPMD9<*U;@#=1nrg{{$)9*8|dlHj?a>o z>!wF4f-_hu1ZR{0f-?yrII|Ffvj`zLE0`rXo8Q&H07UTtEoT1;H%Mg(UZ@Ba2I3m;|UU0z__6 z!a!A&N>N?RaxU(3+Um%(x4R_}i|3M-49}$`falUecrGJ^XHE#uWx*`Za>@Pb$V{=z zA%*1f0IvxW29hFEisXuxvy0DZb1Y#Pa$OOMVmC{K;z|-gab+PCy9=S%LkPtRFiWwg zN{`&!O^K4*#Lu>DC9%K?@Hma9kr%T>4CMbxk00YY_&jqEw3N+Lm*W&)If4>^g|Wb6rb@=Xw&rbA2H^HxR;e zLm@mj0<%0fmb~3^*iDc^a#J93n-K<*B9kRqyc~A0<=;G$KfR(P%VD>$WTHa&K@eJ?C+Lju9LDLW0dmI zYJLANyT-G^RZ#-totU#?Rud~zb;Yc|IdR*o_;kVS4n`Xj43iua>?p(p!-be&Cm|-- z8N>wXg4tb^kpCO{R#O0;9RWnHh7j`=Vk5|=I5+)RY2I?x`dn2_+@i+c8Xdwd7sl+l zWkdCNEfmNNsdZ!PYgmrwzt+;s9SPrPY0*bFs%vU6y;kV)4ae5ThWgQb^CDjsUs01K zfr)>{wEFL#+M+&RUqwz8vdk~ZRL!zySL?s>NMY4Au8BI5&FrhkR@XOFkEm~`ZyBH4 zgC7T)wQ9CmcS$sbQMFC%XEuhfe-N>Ci8U+%u61P%O@1|PbNdS84^Y-N*0}Lw;P1bX zI%xeNJ@^<%;FXJ$S;JUX+t}Qy-v?NiSZzy<$J>`D_0d#plh?|>93LPd)cq?3@-<4Y zZ5O_XRNFGH$?aOMTh<5sS&SPQKDLQ%{GDt;I;t*jkl~#x_<+V;d)= zvF$FTv5g1S*k%vEzU-ld{4{63C)Hrs{{XCUB$Q!em1IY6*mz!RFUz&J&t*68{t6Jf zm|iv1b#))hf!6zSAg%WkqV@hlv_3$H)(3*wi`7BIlZ(~CL?U;HL|m)}agp&qYo`9f zJz5lJ-qGi#_zbj0%%+CCj>1=>Snym|%~zFOw+eSCrQs|o!aPlzk>N0_3fhM&8QMn( zp?#zf+D8eYeKaU%*}}+UB+O4Ge#cT6?l=yJ-0_5RM@(AwC~D^?SgsR&uBweEWuVwB z7$`Q?i1ahp@$I#(2-hdA-AR<%p`lK;Dlyb4%7vj$6=JB*k6pF#l2AH-Yl)+;1vQLr0&b3_U`CL`2W3Vl`9@BV=VWW$L*yv&*Ho8QJjV=Xcqj_bc z%OuSIeQK9e4raLmh}@NgGE2-?Rwy#dRhH{&pQ~ys-;P{8*L}1vZ|0-WwdLWB8`GZ` zZTK2=)=DFqTIv#0Y2<8ct7|B|Lt9;IRb#8`lnYy3FT_?i2(i_TLTq&tC|k`hTiq;S zej4$;g~Bo5tw7{%Ba{JSC1kH61Kw`A?(n&)HphUQ>3+=yr$)aTf&1s=GNYS1|3$u$ z^)LRAc6{cKJFE(KCq;K?y}PVltarC^VZD2VSnpmT*1J!L z_3j5{JzFpHfQ0#JLH0pP#&iz>k$ad>ri(R@rOb3Z0)>V9k66Y>ea6gHCHorCW0s1J zk8>a$pAe$slR|WSN{Eh6gXow{5k5maS;_w_5wd5qN76;u@f?u` z%J>zXa7&)Jccg0?%^NzJXS6p2_;O*}Z|?Q#Rs60_TE4DlX_G1SB$m|t|K3|b{}r$N zJWunYuc}q2w;18wix;fz(T-nKGVS;!A?^5OA?^4TA?w6~)T=h0)*F`LylL5~_bnw;@7qG^eMd;W?+U5+Jus>FeF?L#{Ct3buKghp zxsM2oDSWK_l?5^M<752F&nK4uQ=gw6&Mo3+7J<;`9Ei{tLI`~+gwR()2z?D|>c#Y8 z)c=Nf7&*S>m?>OBc=&R^w+Q9_z=6vBQAoKz2`TqyA?5x8+LVssl=~}~3>3c+iQMlJ zVdD)M&`Z7YQxL5cAYap>_Oe6+-?mB}0C?N)YnX3n4#)5b`sE^3vjB zJ`<6ob<9j8a}+Vvu3XS46GCGSAvER`LSrs4p)t3F z`HrichjiM`yZ{Ty2q#K#ew9{PkUB+8X#qQZL4Ue;`9cl5Q@kjqMh!oHE@MT*GN)u%E-Qp(xe%7i z31PWBm>6{h3G-9PXGKoN;#~k%sS%=DAtot(&9Eh3Zs}&HtmIFr+D@%#QkS#TT$6JN zb1PE^HY?p9x*Gv()WUP5fv8NA6^sC9f%zR#>{5!6_Z1F5mT5H&UsqQ-_o)Yu4ApD}A-+>MEcKC=nOk=v9| z6g8VXMUB91MhR3QnyJAy$a|6MPJZ4YT2QMxnkU>f0wVakOgb`;`>;X)j-lMqMj z49XFVpt7XAR<$yEh2Qmyqyn`S|vkdq!1#bgb=9{LZlu{ zh!iB8=!;>yk^`4F0FfI_I0=%CDzUO4rHZ;+lNB(=7vQ_wZWe*E<3N;~g-~u0Lb+84 z<*}f;n`usW8%I2Jx7|68+;~C}`&Yggwg=>3FAJo83q5&HV~!F2qhyQ_2{FQ6LX5Dt z5F_jZ%5S!Ib6*Mnr7wo<2RB;G{y^joAk-ic+d$sxc#t^IPC3Y*QguE>9&L^yl8g^W6N%h062;>~ zX{)$n$pR5sF>PmId^pa|hsg0thR6v*h@2>d$VozooD3#JPLXh;Z-Jdk4!nID5V_L{ zCqeQIl~`GjQbps#nO4AAz5qWyoNW;(pTmJDpDTp&c|s_kFNE?1pvDK&oblm8;$eKa zh~vmzOekXZ1%b)gB4gS%9(M`6ATH%omxZC>QX`H2mnj+jFBhW!6+-mCQi%RnfpXaj zy3xB@!hhfX-`7Bkc5*Ecx$6iuD#Yr`N9{+2Nxa{6y_Ix>FUdYEki6d&A26S2FJos7NegjtNGqCrn{Z|<-)RWjAzC#3rOg;f85km?@X7DDS8A+(+qLhCtDBZ6rMv*(E?KcT%qgf)f|VU+c_ z%uJ02<6fdbsub-m;3ff4mXZJC^HRpUd0-J&T~l`y5D%4}@s(p%5)T5~9V&pzLqPK#@;~ zhwov3$}v-2gfjmyJs`Dx(QqpEvd^gpB2p&xN|;*u!bqUcmr6#TuY~CHwGe&25u(qx zVA9OLBa-y6?}@M|QX;g`%V2G_aX*p>1?inq2tDm5I}-{&D;WyE2%+$+5DLEuq3}DH zQ20Ya|1wy+>i#4RC;tWTT@l`(>5$m;BtlFo6!p9rkVkGtf2#NVOcsIW%sK~}vk0L% zs}P#A386VVD9@X=c)pByxE9aBapdMC6s1kD)l_u!Tog;a;+|SLbicW+PUz30Wa!T; zg#LU&=+7^N{sN$^Y)jY|lrTTFi7rH`_-A2&O)Lp9Mj>V|3$?!zYBs8iUmVZT5v7;O zFKXp2=F7ur?Uuju`WDgkjs=G5jRVQkU9} z*U9(LI{9)=DOxAL9D;bA{PG;K{L>08xlVpXOL{u9?QRz&@>EwL?7InJzmgF4D+^)Y zU0AeEzK0|e3Ibf4{0LS-+^>`G$x-BbS$tqs1?`fHdt>W}ibT_RCOh4Bw|mZR!s9jX zy*U+wORMaf_dZr4ock)FN4que{Sea<`U5NvCA2l~t0*&yttv#ZfkG6k6jDghj=O=O zTTQ7Y7rn1eO0wvE4I+_SQzE*cZU~YR)=~+T1sS8ws`s@mJCp_~4NB_>@xi)6^jl8| z#r46gi8qkk-w-6#Y={h{Hv%HJF(E{(xr&+}hT>)Kn^=}jGg&g+!m{_xEE#TtIS{wa zg>c(K2)8YTaN7#Za@(4Cvg~~bk;rW$5oXEmxH}Y?ewx|V(x_)U38+VJ0IHtth19cy zka~uJ8UV#!*YF*M#mnA@BfuU>NRqomLRG6?Ppun!$!ASfcG2#&U#jXr1Fg~d&XMRANJ zLvc3=py-59Y!*VXMF_=KFiUZ)VbuS@Q_ZC8RA0brt1+%ScKjO)a=Ke&O0+EPT)m8Tfts|OiTs>qV{1z)IMB@+DCw> zoh~LmQVIFV)A1uKc$M9;mg_j5%f<_Dn?kHYSY>y-g0LSok1oX zC3@U;w6W)zRsv+sQZi)D7DDD6A!N=KLgqYB_MA~8#`zNFCtmFZvS7{+PD47;=qmUMI zlaLm2vyc{Y3#j&NYe8=%k~}ZnMkI2#OGNWX7i!#rgnHF_(t5)~(w&x_dhb#)_1-O{ z-g|`9d#{js?*o&1@0T#UP~!mvbeabNK7>nHOyObWuPlh6A9~`28jo21M}2Igb;dC2%)Eh5PBNarOfoAZ$CpkxjsBggq2qkVT;`vW|9RJ|8OU9&qD&5 zQZ+SyczSxl7^3ZqN=Dn4glPM+5N%%(qU{7w=AT8w*sBue|8LcL4Gwtxb%0kr2{Cjb z)>YOoy2QL`x!&@*yr18;2%5jcfi!d@JGIG(iXd$a`VPBzd z=8ISalPt=COtP2|lPoU8BufY}$&#R&xmlJzy%g~8SyGZztj8R>w3Ga6UBDWGDMk~Y`$&$$! zmCV(3FohRJnU$@i?!F{@hdB8$OZySJ9;9Hc(syMQb{f{|sa#mAmk?|97GkYFLafyn zl(ps#uT%9ykaXz&M3{z>h$c|nml|rgtO-S{t3#on$ z&{t36TT{X|zZI>84708cL~amaJ0k1otjdC@7Ilkt?UeQWDZX2*ZxLv1z=3FOD1_EV zLTGI)gw`gYx`k;6vrUPIZm}81Yz9UsDl;+2nL9Q|z!|DFwMS^YTUc%?-crd_yp@oO zw-!?I5Fr(B1Iiw@)$dRV^Jx{^62}(X0g=xGan2qC|#5b_N|$d48l%?3A0GNB;A_{nT= z6LCKqJcgsl?Pl?TRa}LV+2B~wWHLB@x#9m~@4N%6D!OQo6^x3#BSb_2MLH-^6hv%D zk)p9;;08&61Sdg2J@(#v@4ffld+!~4@4a{5Z|ylV_uk~@2E@2TGqd)Z zIp^G*nmsFA;B_dDeh^C)iD@IK}Zp?y^c zq5XtR$Noa1J3t7*1HoLi4^p{5DH=vOm?9!R1mHbcq|mT+D`I|QPtOY4xa3d^ z=Y@~3YN#EFA!$cPCP&{{&C6I>tF! z1&niwka12GGR|p2#yK6-Zbt0&i~0;<{(0duDMEs?03O>T4HAe35;Qt5e2#gZ>pgAG z(k1E6qfGS9w>s!upaSS!D1_ccLg-yAgx)1!F1<@t?&*a-FQW*0mjgULM;hpfMj?7v zn&(yCv%s4%uBJvLuQ3luUaJB~UMGa)^+HJAAcW+NU@pm>&T7^>a9~!bR{u@B)mmqj+B3XU|!`K-T`1c~Rv=`jU`H zUltPSEFqD;0upKVob{`!$TT0;YxprwuLFsDgA_5U(^#J&%T#6GbMdBmz2&{i_2ERl zT{Y#NeQz|k8u8&bdoKmoQhBaEoa)rsPkq)Zegn=mc+E)3Xs#Tjr$@7`^x*xJX*}OO zp~{igO|2YXHG$Ve@M);YypK944(kp#6zl$A)PF(eZMiJ7i~T>ug|@g9nAf{AQ}%YD$M*x*#1e^%v6j1l4TxJ z%~TqKw6dAX*>lZnj`MlP@-@(}uCl&fPhZ#7P1bfhns*?SX8fCI8tg&b{4{HFb6vpt zM4AQVg)}XNNYhG)Gz$rlrUaBUt-?R33#%eCr(_nP6_GCr@D*B8MV>NLlzBVs#msAQ z?^RxtbBv3-KVG-b`-Une*VXDXfla*Sh3#o7`!~Hl!tZ?jdlJT1P36Oz+VPe&A>9%T z-K2C&8ZV?(?uE&=R*MMjFeE~$5D``pB0_s1BCHDL?jAajj~6CaBa^t*RmA?G z``kR|9=>lGj>G9;Qg5c}T9RgRzk}C}N8P(+YB_3GcFRY&h#lt ze}Lz8RN{RU$dN}hdOfOpS?5bxh?+Mm6a0Lk;TKN zsx_NE0EBbuoor>XN;|8XRl0_dRl25-RoX?!DqRcIrfQ!l=t?G@g6l?x8_`t663t#5 z?Li6SY6WM<4d>r_nmgn6QZ?iD7BX%hA>;NHGVa=79CsZR=3X4_M*&-H8IZVjN%JYJ zCx7k^1N`=zUL5Uj{_A^xwqO2D+Q2dp8h{}}1BDRUPza$xLI`aH>fa=bi-X}{^5KSs zjj$JTa6*QlZ4QnEQIb9A#`g%O}9nO zbk~v(KMJQ}b25)qv~+7{_Q}_D-b;&4tfMJ?i(gjJaH_Y?`h{Y>s-ZYd2*q86P@FD= z;tWuV+Ns`|D$M*9GP}_dt#=0!w+AUfRi_LUsY$BSMDe;qxWJHDlRbSCdo9=OAEuf( zG`YR#4QUFm`Mqr@q}fMaNVBgHY4#H$&Hh59IRKP2_NJ!;$;35(5E))|rXuF9GjliF zoZTU`f}6t5PFvUz4z(`fc9^Q+cDN93M+o6|q!4aLfsxzMD$L9wk7H=Wj2#Q`>N3(f z59N4`TUISK@-~?htj`mDpMH}$$ub0XGKK;>MMz+$3JL5qA%UF^YLhX2*ksNiA2yjY zu@iR|skknO>`g6zv+4YPg&ygv?kpyN9$HlJ}~|vT6mDx3S!3 z9o+9b@EgkmmVxqv7^3`;5Xuh=q5Oyt%8!EDSS)fjmdD74jpcFd#63YOV)l4xqZ<_e zdu!)OctKpjXQwP|pidcT;(uDz#Q%(t_@5OL|8qj(e;(A7Ev4U5FQ_nmy!2lb>5I@} zoxB7j?qyQ#6w>fDM@{b(W?7S0e3SBX*eRs9h}b_2opL@|{BL<~xWv5*TjsU!KH)VB zg?W8lUd-zoLgw{NA@ll{ka>L@)V$jNA@7ih`-FGNB_Mw`o;kC5o+1vO#IX^$|U3N!z*IOm5H zYh(d{7k`mze~<>R`DwgAXy$SAmex}%-&6V5OlrJC$38EpkB63)Hu|0@CH{k=x(YO5 zTFv-+Ug({^B$3laDy*G6xpulv7V;wHDHZj4Avh1%+1E$;?5Ora+ofOc>{812K`ZK~ z)wRd6t1YAT&eiri_^*@JPOG0ft)A0I^jDgxoWl1@IqO}|wK|Ox`m`%BIoEq^Cmsgs z!6!#K70#3FJ$kL(w_l$=>-6o{uTSqDy}S2l&uLnsXYsVrs)*;m!#}wtCJl>cVR^B5 z77?;|78SC1S_@e`i-B4^9m1K)#VLrpo+Zd6Zb=of@#Niwv=oI5ubIdWA9glNTMLF? zM%4_ztdQZC6EghrLWW-f^ux1uS5#qxyO36*jHS~C;N54Wjfk{WtFmfQ&D){0vnHj! ziQl2DVi{<)#}KVmh0y9Cgw|?8Xsr%vhhovetRwk&9kvr0K69ZWL|K)^Hydltt${y1 zid9yxu&u9Yok6UNsv)+P5Mo`05bGv{Sa(o**+(dQs4z3z40_^@l)V66H%6+hFr}rK zyn5+pHT#%XU+-1kmmvSzHsjW&izee<$NDGke)1yjG9huVDfk6T}b znYkgg0X-na0DybjNF_zeRFQir((7g$n%5xj%Lk;ZX>N9rZd*DF z!p7ZS*q*ktkx*iLd7;D(LX_B1h!SIkD6tbLC03OZ6)Md9J@m%W7eb8(5|<&BP$_4r zk+;Gs&1-`9@+)j-%Migt3`I~SB!X%o5lj*i!DKLZg-szJR#**o;%Z5?!rE$u6+fm- z#T8M-r}6UI#rlDgQ#F+8gixv%LTQ>1O1pv*)!u+JU4@z18GHtwNH!Bl+-{_jEM=rf z8muk-L^!D`tGVRBl{x-59NDq!_Gv=GK3z!IX9(%!Q@h74kH0%pbp`LfJd2um_vP7S5_gV@*lre#^X$%5`?6}u z)ZpgJ^UN7K=c^7n7YLc13x&jXkq~+pgSp~gqVi1cAeT}?xR(KmyPOmfwunW`?>EwW zFRw6{D|1|On1y>Uud-^GU5z1T*9c*Dtq^9{31N0Un9J-2^6}ow8_6W@CKVycB1n?E z7TnEL=xWm~=D=XLs(`_66EfKCLI%4-$Y6JZ+HENW?R)PMW*T>VH|2`mhkDj|gGv&+ZE2&7wbBHB^7W z5Y=CWQ2k8^)!&6s{R7P1UjHN?|4C`FfvC+x3N?GH@6gKniM8Bg#aBXXZ?1oGxv^?W zRb3tb1=n?T^Ww}FDU#eUI+9KN@BCt#KZ3aVG)VS-(fN%a!7iY3f?ZHZuq}lI+e%2V z3xNciy+IF(PoRq1nTjLUc3xP3Key;7Lh zN&G}yWYplE%KUr5L@#*e^;1D8e1Uh$6uy5_sqdR8BHba>wWK7lx7&ZxdlPadrZlgk z?97B_ieq+WrBU#HR%YgW1~2{PCD}dMyrJ`n>l0xFG_I<~ZZP&YQW70I0JIGYK-b;7 z=Jk>@T{av33xM1m?N4DDDQ+|#Ur|@78=JWuv3(79EVs{>p%eR?s+#eWr)AI)CaJh< z<#Xf>PCIw??YpRxE*0a(x9{8~zpDy;6)G+v;^59~ZqM4el4tU4nsl49t4u$RW?w?9 z;0+cjE2GFHazsqOc~ao3C%t=j*Gnl&d-g7!=<4!s3bS*3L@=eQW}439X#oF@3|pLp zm%BVG_>iI9?wv2{(25xnvkxB^?B2b!OX*NLB;O<7YgBr#CtS5?y8BqQ8FJ4yE7xxg zRW+H)3A*>Qa`H?9%e#CU&Te+jS)X~cJ8;gf7d6;za5JjkLsU$yD)c6nuK6?f*RHmf zmgL{5)_hEJa#85N5>eL@w*vcn4zoJU@IQ8XJPhY;SG0ox2bPso&4HzjkORxgLJll# zg&bJgfjS=ADV$O=@to}{WD?h2MI2SKx2>&83FGRZlN~plu zZYLq*b_V0PYp5{ywzV}W;6U32NZeYa`4qa!zpPpe{UJBKZLOR6clZ7ra{0m5!!i)+ zi6KJ0gb?a2gis$Lg!+Q|!DeyskHp&K!)`RLCrD25PyMXbLwc z6E~9~WH|e(BBroi_8;1&rqB(=7e<=bf6vAi}7#WRL zVP>{QAA>8K)>Z&#UP)({cDcqVt5&>u8{Ib6)3&}Rzj1758G_gzLqY5yB#0e_1Tj`f z5Icd|I7|zatsoyxI*!BU4S1wt*o|%De`|ljO#Qc&_nWinweK=$hq#)c>_Q8twku6o z=4gVdnWLSB%+W+4b5tc{j;cW|v<0;EC#f*=zu8ECNzch_Oh!63yeUB9YDihu)#(&z zt=mRb@HWp{Yckb0Dc^%FA^a!Mw^g1P)B;BWci z?{;A#*sKa4QJl>Zn^m2>*sSV>Y*y2RY*xDp*{r66+N|vRo-@eABg#xNT)0pXJHAqm zC}9qpnr^o{&QQ`q$!_W4kg|vM1f@jPP})-nrM-ku+FJ;veZWX*UlscEBFzrJAHFQ@ z{ei?CKswvR57a1S)e1T9pmLCPb+GTsA5;#p3}GCKp)d{;62{>|!Z<=m7)OFSsF)h; zvyLJk4k|}uC+-+hQQS7~pc2CT-=uAv=EWN7A1l*b6!h4n{EifkdDS0u$PYapgXM{}fvqC2L zIZzX9x9>eqChl2YAd|QkRm93(Wp)&DFX0U*iJM(?VR!Pfbp@wcs)o}mLO8uDgwtz6 zIK2)=PH(8t-wf9547oRPW<9(GB<^j}*{A-F#wn{-)OkCOcdf7Yd|!UY@xEmU=s11-u}x;Ik7M_8wmvY2yD% z)x`g`kodn5692bC;{OiRMA{dZzgOYE@5zuKpv98;5lGxmq}qj~;cJeX-i7>ZO@8rB z>1Fi3F~V~-bB78l-U#GACD?{-cMduC5KdAgwtJ zZzm-FQX%oLA|(FypeEApvR+k%|GrNbc7PU3W;KBKhmdLyl7_E2YP<(&=2?=C)>9|n zQ~5#j+OW7T#R?M7STaoEl;PZ#O+r`}Wsek*j_M`ke!`gT86=~DHf|#?gxgk#aN7wHZhIlZ?Ep$R`!Mp3D$F!B z;8aQZ8-LqD8@dX8Y{^(oMmc?#2n?4H{vI)lh0m)v6j+Q-!eFMF=Y= zgjF3Vr8;Yg)vM5-ly7$UY51bst^h9^CY5d}CqAk#eyIBU^cE=FIJ%lh! zgfQGw2*bTV={8PzNbU_r-S#1qxP4WGZdz0E@X$;PSZL5Xk$m_icoKHvP9~K!E4I**YU+^bPQi_S#HF!Br&=G- zIZf5jIb8^yGlbANQwW{2KuKgD!aQ4rndSyQ2QQ>L7f9TBq>?ISqXuh>PWg5SIuM;!+_(TqZ<_ z%RvdzRcqx675WcJ{7odUq(?-%3P{}5q!KM{3({PMq7fM$KCd$I zMfu@f`43skhkZ*n+eQy>Jz`bxcoajt9uva%aUp!45W??CF#GV=eOR#O5B^4?^iylMSOlM8)~{i)@2{m z%KdsOrL{FRmE-HvXSy;~b@>IZGC!|>i285L+c+ybySEsZ>5?S5k9WOobO`tzRkUsN zc-OlWv!>qz68Ao-J>KZv-Z_1|D~9JjQFXy5ygsESKH>El z8O{f)hz)3=7CDQ-eL*QkosE46n-Nl!f%C;{0_{Wq3>0mX)w+Y z6cYE30O!I;!wM2P+e)g_=e&M4mtS&Ra>#|}yneN6$o+;Pa=!~9_lFR2e+nVjVqiYG zdC14-yyhjt*QQm3Fs)j|I~(iV{1j?MFJP4nw4e$YsHKpBS_v6wAt3{mfI5hZzIG7{ zt33UX&@*fg$TAW&y~Gr!{?FOQY?z?tQv}? zDuCiDLMXNuLUC0g6gz;q6jxJuqvw%UrxcPMfy8wp4J1XT5XsKwxrX=jPu=Bg_ijxp zM6-)IKyxh>K(nh5n%#uZ>@I|64=|TzPnD;S^W}Eji*kte1`^kYG!PY`LPYzT=i1)0 zd@Ise$Y; zAaTP<16h$OM0SLEZs|R3rDpf$ZY0GbI?AdcI$8w~9V3M3RziqwErh7vW0*^H8A^4Pn>W9&_6xozcU~~$Gb`%-r835hB){~znRCjzh-_W}~PH>nn5Dz?^M-eTOxy!Q28 z#lPRYA5Klq*Z$T6^L2o{n6Cqc%-2Ce=IdY~^K}TQ`HJt$KU5XXd^-9td)DSqucN$|{j=fsIk}If9&NSIJqAN`j}=1qI3aY87ee<0Fn1?-BKi1$ z%SmK7$Dty2g3s`uT9c2a7I=Mn_Acg}Ti&&yUo^c|86Ri6rI8@H1CqM`OlMuAP=CDaro2 zDx14e(;a-aKmT*uPplZgwP{_C!2^sfdA>&>G#&IuIVeW%?mr=lO<#K?p zgOTP_xKjRQ)ne#(FzJJMSDF9S-rt`xy~Z*Sx)wu(t`kD&dLe{v5JKoiP{02yF8-Bse8!qUJwUN<1h;iHC$J@vsmj z9sxDwc1QK2Wa3hLj7;JlR}nI-P)r8*1YU5Fa#=26`8{b}z~w1b!{uoqT%Hla~B=Bd7{ez~Cw$XlkftdCcGAAUK#Y8i;Xh9Tmw3nBi7 z5aMqNA^sMqN#cd`s{@2!wdk+@SRH)f$3Rj`tH;P32fvSo2 zLm|0+*`V0~*gU^A)eL;%U)oHNO-zK`?<5XW-ldpV} z@^UTm+!uz&Lu5&jV<88d**K`XuNegK3vaLA7z4!rR$hqzoe=TA7b5--Ld5?Ol=${C z{h!Fh?e%9eiTg!GEVN~t48{G53q%xpb`^w;^*3t|k>6Dfkw1hG`BMmy78`;PnFowS z=2c;V*L+9)+5S3DIIDBm+Lp4BAicDzA-#+c z(#r}Vy_^uz%Y#wp6;v4BCYb)R99J=Z(qH(M=~kpKW@IHGacxMo(WIQEM$;S3%GRW< zZ(?tBYyJmo5j7k9NOkS#7~KkQD5W+kx~(EFbZaj}w^fDc)-+Ls(%P0GkaaK=NIxNglnDuBT_J(22Wm?) zJ=l`^lMh?c`q+FTh*TUq7vGZd=iUvV72S$jR_3tD474s`x1p+GH%JJ(jfAipEQH<0 zV3c_i75a~Q%=Q{|o6-omHv2ddc);~dLx9Wx1|vEMha1H6e#tU)!}_KnYiJMA(ObRRFrNw&Bo@o#v4wO zB|D>G!zs6};IxgZ;k2y~PTL9Lw7n2cJAjeXjw(!_Cur{fSvMAEW^yNhJBCPSpZYkB zQ&z30^ERCE)>p>& zjhoqUW`AM08oFdm@y^ac*s5x6Jg84qHPm+zLfr|WUMGZlJs9U;nhO1G5`WL?b-U6d z6Ez)3+ze7}aw&5u)AS}c)0*t&o0M0gTlNG&QzsmXke=O>3~qNuMApKa+a5*-Srd67 z>z+bn-Ajn9dkc|uA5gN|HyZXO6F0a0$Ruum6{VY7vvIit@P?Bl$xe0H+zzy^;B=6x z;dHPNPKOBLbf^$chk=pP;VSf-Tl3=|fitssB#^kHNN1n=(Hf_$T2be1ZpT<($NIkf z=60NA2;_JS1#*IrKu#1A$Voy1IT_UEW_qx>okBirZl_`=?le+y1d9FQo6SYxPNyHn z6X&e{VN*N9#)9^ls)qJiLTH~Yg!VZ?XrBv4{m)Zj=IYkOI1SIJF!ML_e3nj`uIB)5?;_Qdq&`w%gNGeHrVLp> z0r+4!X(J+^sa09EsOBy9&#lQ9zKLJ#Us?uQUtx&W*FtE0BZStsLTG&lYOz~%F#Dc- zSnNMwC+hpz2Q* zX0k)H7-U+^10-%RR)4Q>dl2y$;}T-jQ~udOOpXmm?sJBnH6r9k3VA+=i?+sm0C zRuvLN2O&YMCZv;3%NIuM95!xs)fBv&u_HC{ZpKbzcw9JLh|XPw#MMm*weDc9j6GED*RT!IlRSa;0{Es3DFkdOijv=c+sxCV1*^4> zx%AC($>G%wAKh%UwpGJx9Srg6Cxlm-5MJvF;k6!^%d0>6>W+S-^|3jrK`J#CMbf-U zbpxo;U<1vA!8TL@gAEcg*hWGI8!Tk7jX~``6oUTI-b7gF-Q}B7ff}0uoQfa~YKRhQ z#G4tpXNLQms`vMVhnW8sIsV!87H@7EYSpkEh9S1Yg|HnVgzc6>*p38qr5Qy&-rO{r zOyb6<2yM#H#(wsNbHDyQv;INF(u&d^YxB6*&b*9yD!*^4^qTO}F*Q{)N-L+wn9YMPKXHG3lU)l5D~JsJng88 z%-lvimR^|PodC{IkfLIBDubl;E56mdw&KT`*Ld%hbNx3%NtCU+L4=j&&NNSu7ZL6( zB*KY8BCHY;VKt}-AFWZ9swCdK9 zkLROjHke(k7H$qh-0FmIs~5s;nh!e z(r+T9-#vx&yBDYpQDn6t?hS@-D({2M152b@*%#+*^<~^Ak@NQSfp(9For#~~Ux{Bg zv3AIKFe5iV3UB3vXygo}lUaETBRE(JAj3u*yfrozm>Gu+GJ#)`QDNZggA zOiXpEfo98=McyT3WjeA<{DSG=7tB@G{%YU8!7fkE+WM}sTEx2+L*iX0M7-;ThCF54)zDvAO$&R4ZsYD=7TiRgxN|ImgYe$2k66683qe z{;QGQd-UwxtM58}di3q#ZiNF2MUiJ0O4!rfW(0}#c2yJW9YSKgQ%J0L35oS?Pz%NG zL%D}c+|%4kCUN(vh)DDP!MvYBhL#rDp~JrA0c*j~52~7>9}+V3!$O9BM99#Of^q1_ zRM_Aj%*QEXZ9D-a?n%-{M4nQsvT9My+kZT5O`h>h{Ql!v%RuWn4AFXC2(1@{(0Wk_ zt(QRUKP)=7o|nnT-(0iEB<>XzA~eKC%n} zeT<=iJ`obor$PeyOh`bVgPIl7g_yn|AGXOau@m^5sXXsCo*xX`I!uNgQy5DEwfzQuaq&e$Yw_l8_jRl zfRTS!H6#BaWaK}EjND=)kdfyBFq1dRd=xPu^8?)PLE4bUf@;GJ9`u{H$+WZ< zt$YhVISW|^QYC5wsfC4*T0{t`MTL-R4Qg^MHYR5=^5KxXI5szUkc!C?2-0{`mZX;E zqL7s)tofy^DJ+&&H7u49!eUt=ES3|(VtG)~wAPwmL4}zn##@m}L|O^p77S9TRi`Ax z*Mw=}pp*BhLjS*Cc-nPk>#wcv&kjN(yTM`rzq==%rXx^0tAcVVhC*0HNNDYagtn@X zP&$CwlQ^r9<0}rNI*HQ(38&S>yRVym-nEU+<#eP~-npDk6r|^JI%6ho4N~H7z}KF4 zUDK*^&*gNXM4GQ9B!I3$0_Y|rfbK#9=poEIm(x=vv#JG5QaqQ_i@ZOV(;JKD$SmKl zd?lhx&z|H4o8A%H+4aSbC8H2>Pv)#`%^|psD%vzUnbVJAX1)wa+`6Q8GG{$G6GeX^ zQLHZ{iVcKx@~OQvp)nmdKn?}Z=?tVMp3~WoOyUNqh;2Y8hH_$Z8>y4BYQ^8+)XrdQ z0kMr$2eD0r$iAtNC^r*AbaOCQ)gda+G#Y6Oiiv(Gkho!_Vctd1?+wy3Jj2apM2<@i zy>NzSORI+7NDR>%C4}B+A@s%wp|=&7OK)rP;S5hXcH*`nl{VU8rgQAJrA%ARc2>tQ z+pBbA+^6_@=8Duy)pdu!AL+FpnefEyi zP&|+|p7&{0)K};kjf(K#R@ai@HQe<-z1B^tv#(6W7j>1m-RO=PmP#BcQr_Y4y}OMC z?>$rv??ediJ%#YzO9=11L3j_DSF2D zBh(I5HPj9gLhWE7)D96s?NBgMJ4}U{IiqnnZCK$)0Es)2bdCc#N~4xlONzW-2uE9& z$M`P&FN9+)Ls-XQD6Hd!gmr?Duuc>b)=8i?O;ZQaPbMFJA)JDpxKl|*b$K*zYX046 zIMIukWHk;y6i&AuAajPQA#GG_@PbG8sN=YUb;b5+>PgI(w0gQn*LiMxOlqSYxE zv2Xl)A^bGG(3)K2o0R{+IpPM-UJddO&zI_xZKa(`{X-6=owY&u?~!r-YU;FcJQO)G zJPTQpJ`-71I<&H`u3~5VrrtPCczHL@d37osRqynyOgFZldeTfSb(J#o?z?XGjAd!( zt~s9>oAdJ^`mfag&E7e+;9Xk!7hl}lH9Vg+d}=+XuPY|=&OILDB(Scf1H%JX>1n|6 z+~6ol3Z4VZGWo}tyNg)@tlYvou1jovuyQYz7c2KNAuIQCAuIO^AuIPvP%C$la7p+o z3gXV|YBHSWP!Sta_93NfDPe4_#q3rS_Dt8AJ7Zt3YR0}n$k;au8T%$7W8Vz=vDtoa zQDN>0>RTyb6S)mY-0h_K6z-6JS+yAE?NjbF|GT`u->2Md83^5jAwu^GA#|S*LiY~xQA7Q7WcAKNq+*AmHuD5$+<@ehkzwob|S;>?@@~t-5ygl zx;-vLwWh7?59gw(EQbemxBa)JFA9XmFn(TIv z>_w`)^MzqAvx@c9-uF~Kl#QvtRV2L#<*!{ja;wraY8U>s*};ZI?bYOk+N%puyQ2`b zI|)&{GbpuNhhLj(P!M+rYm(uuQYvBzb1|J8(IF#>bym-?@eH=n zAilAxA-;(a;+qN~zL^l>n}gDGF`e}oqQcDIM{x`KV=jgQoLVH+CX(`&DvdW0&YH*5 z=l%szcBXtx>$;h|0BFkC^uJs;oYp!kHNrY2&Mh&oT;x65C%pr@9nZJG}-}>H0Ev*|)2V-PzSno2val?YL@Q=BO86)Jz-K)q|^~6Lg;d@S-bHPpYh1 zG*Ot-dRi!^^~Ap1yEoB1tFoRG*E8L#gU;1fMKF^vg3gn%z0Omx6k3gHgU+=oG@Yl) zBGO${?R9pTQRg}`)eYsXS7Cam)imtH?MfQuoo*Qz&A^bnGlg*2O^Cd^3mJ3|P@AS= zl){NHQ@(CNg>z1THly*Lbc4ow0lcb+G-xcYg*4vBJon9dHq>}Ot0JQPF@nYiV0(=Z z#8P|*sWxbQunJA%Lu3)|p{n*8ABGtS6CxFseF-qeTg_-ho3Thlq@-`#zN%VohCj*H)g)|5(qJ;!L)jUtjdNvgJ zbgLqqGcba{XJUJS&%#o0XR9^{e2xlD;B#dW>v^j70-ui=1-^hxBY`heVJh%N*nC@# zGzxr)WngqEh6KJ$2#3ps2z-T*L9YZQuwst#7HSH1i z8i40)NQ1Z{SxDUL%=7xJXG3vsuqr~i5hI9u6Sf!kW-JAEi)w?ox2n*@y-gNz-mYpd z?j4v>+&jrM68A0@rsCd>ow$2Qqqz5421fT`NZk8{aCkt7xDN^$^dV5urO1; zNkMVbGe&;#j@9vdtWML`O|2Nuo9~+1BR@iy==~^=xW`C?-r`+I@5jyaiL7Tsy`Quy zqI(J>=>0Ud*ZUbP#rmvjgWk`n(DZ&@7NNhOYOnW;m{ISS$TZUXWfi7+&%)-O7t*Nr ztCoS$YZ%h|bs-$y5Tf^+LI!;cl-`O_dcQ5qly5p4db`RgwYyek6>n1Tcjyzr-vtu) z9%&F<#0v@jzIlF-^=v5khgL;+A7KQ+KgRZge}bi8KUHlI{4*7r;GfGP_AgZJ1^*H= z3jP(DMuLB>!c_2YuoL$!X%zfB%fRS+3<>^&5Dq^I5&S11gZ>OkaK$LWe-UQN2hE1y zw!rPzM$?P?SGq&%-+;vZP8zfp=R#WlVV-|xJsWD>f>R0pKYWa!^}N_#>-n%0=lrS- zS}&kN(|SQ!gxylrUh7tvQR{`sG}5|6g{jsHV<&DA(x~;KmO<;*7}9z%AsiMLqV*C& z23-=A){0SDFQxKKIk^Hq=nCvi(xRr-UYZV3dl?{c%aR7Q#k!E%%bDl$S1zN!skudPB8dmUNC-A~nC>@v(K z_PS&miM^f*Q?dJFCvJVxDE0=HfzbdAi9JvVhYf{@JxIu)8-WsAF-q*gLVrfB8L`Kv z`|alB-k2VddlMjWo00~(MZ1vPo0;e4SK}2zklfn};jo<$xwjWG=nkOd zR*aH+N8xO(?I3sY{}RX2A7bwW@T?1I5L=`Ri9OCd$45{8|ISzjc`Gr3yc4i_Y=uyE z#!_e#RU723B2&GCZh|BDYIzXsBzbs+Cu0ujkp2rkMdb?&9yxOONLPa`LB8%z8w9B( zAB3KY%}pw#QD|owxYc23ta>4ArU_xUtB|p$gX&lDsoxpGO!;!`vd7d^&X~$S*p(S} z5gA_FS)r@UUENGv&~7&%al4ZS?ZhKbJO0-m&d#5^>-3NI9@Zd<4Ulk8%RqB4j3D9O z*j~bYuta)a)dmUoBNHXuUmk>UfIPf}2VxFcJ(chvIS1{Q?%`uRScT~#Jp?;(hmuC^ z4zmoT4#$voM+l*Dq!8_n5;Ew~ptMt9((V{xaqW)91?`Rl5_ddl&`vyxXm^4&I59Rr zyOS&f&66>LcBf$bt@~6gkv>heLA%q*MD5Oy2VtBk53k)>m_yb~wL4qR+iL!ZadfKP zIVw!GI~SXWM@XY~=UWC+7hp)c3x&|QNQib93mNnhQ2i<}X?LkGQ@#P~ZllTx_ReYU z_^?xil{Fdv8Nu3V^_(^wH@Tu_5;ZlI>y}Q-F41YcAzO>ItGkS@(D-tI*MpJD$N$rEkaP#R{ZR={qe0wYxB+^xZH= zZ{bsGIpL;TV(P2vN%=>^Nn*WpxZYLN)K%HGUou+nGuMeZo}1)N#kDR|Ra4<+meyC! zsOSEY@p=b3bsg(?&3P%0o;l{@0S06~9t0Bi5NVhXMO9=z9<~OL#0JdAqn07)$1uWt zJdW+x{1aG`;7Qen`FM&U7SZ@^ zYw%8NfX44yhH&1)2pYeS?brMVSPJe#)dr0}A`>Wf@3)jUkP{5klizAsT-tWYF(HX{^Ac@ejg(a<%`+fXu{CK;nKT z4Ktyrip<0>*5KFJfSLHsG6elQMwp2|u>ETP6H5}b;ABmliFwGxnV6T1M43+>ekSI} z9I{rr+82;>Snc8HxS$HtnP`cfxK^ZbCKj>`q)IR}6AKHWv51hFSX9WMtwGI%0@F+^ zrgDGodBe$k1EF-6X|SCR*zwvmU|cV)~WT~mGA$~ov8ez~<%VXAK_Ht$d%jrz8? z45U`YkiH#+&{$1~zN-rvv?C~e6`1txB%FJFJJSvNt^p)&P12yRxE9g3i#1p)HbCF5 zmLZgG7(w6e*nUsa151JRRBh0=7n!JUZ+Q@EA9;9v`(j3Y*OqhGlLUR&QDLfYKkUSn zkw$&jwG5=z!;rrHh0s`Eh`t*L8FTlwtedX% z5pu3!OP6Bn_Qe^+wp3v{6C<(t-VSM;iP4sU)EEp6vXu}TTML;9orTt*+komeq}uH(=b&AEs@;AnOtsq|J8=h)M(qx?45SXikahc>1 z?G6<(=wYC=Q()5WaA9%nj=%-&js&=#NE);gk0RO~Z4Hiz4bbjb%RuuujG*1|*#78r z0+vXhsM?_2No1mSC(DB{PLYS#?o`Yn15)iylXEya1?^5(VXEC3*oixnG-`L2WgvAn zhO|3J2#s@vXm_5FLC*)JodT0~7YOJ6=yW07pzlQhmlH{YzT#R$-%G5)rLh6}US=6W zxf~+~hcX@by|GPF*Hb9AvD?vnTb*%gRTN*YmtfCb(IHUbd!hIt~=(CPU&8vhn$0U(^BnvsxZ~A z7d9{2BaPbiu?(d8Vo1BSh0s_>h<5#i3|a2P}(UlX*XIp_j}kebc4QI0bB+o z4f={}5q)(t3=hD^2I#x3We8RG8{piJiC!q*33UEd!~E7}B>&2#snX`c4uu=wwj(Dlq9gMfgwdVQUzW znWzO4HZP51^ zGEv`SRrDUoPW z8fW5K%RuTn3=ML<5E?fKnTZ>P40;o&nNVQr_hw=7!)K^PCn!)x~-=8%$9yNBc)_7Xw6 zhgFzr_XsxE3rVAPk68v%k7G!?Cxp;=Qiyg>2^sWhP}(UlY4?n9?)MVU(hd4P2k_Q) z(x9)n7SZr7(w(|*nYvjf~9C*Rc#RcH8Q>* z^mtt!#Q%moyy$OY4r!T+{+68mg4K%@$4s=>g}klORP}eTxq?U~x|47KFAA?d|;Y#&SgvD3vr?{Z#XF%dUCk={KnM)m0m`>qsVQ*GV3P z(ODi|yEQQ5%_wWiIcPU7)vk*QQ|;Em=CU4X)UKOlAk`g1+Vv1Zqo)wQMs zYBx|Ggt4JKymo^yEBY?zhNgA{hk0RQQv<9PM1GF1$8EB5d2-BvNV>*PVG_44rgPQx71Gu#_XT+U7-`T~T#M+tzcn}@HbCD4Ekh^= zVFY~-#`gbG9fGC64pnW?_b@V1-^1lWs7J`d>w6?-)b}VkhkvPpzDKJt)%O@|F6fa) zeUGyYq>jgsz9$HwaiS1?PZBcd$)NOAVAA&#;XnB=)u{}~Oq>QJ?sU>H6N;+HOq^j2 z&WsJ1iL)$2&}U@VB*A&A4Kr~*nK%;{$OBO>l!u>*i!g`uN>}>DatRi)8#8 z91-ayc_7Nm^6)b;3p4%$@rs2x8Gx3IHAoV7OX5uX&G~O06 z6YmHa^j%Ohp};f~?+J_l-gqAuwEF-^+=rw=JMk!@-AC5okTYWI~q2;*yccQbMF&TF9WwfRb7@SLnPskhmeFL1*zTr1KW$ zIW+6pQ0HM*MO4Evg3cqbz0O-=DaMhi4LXlfq3JwY79o#Owbywo%&7C$WE$yQuEJF3 zZLqmENE&tC&N49C9z#0sAcVt?LUbN0WYC>J>8u!~bA{0FrW@jS7Rx@NvaJRPgbF6JVh4a)~MQRT#Fes zo=T>X#=EF6)!1Qk)sHl4TyGf|O~a7Jy9(hjU5LgrgbX?pl*Wot8t*2|ln-k$n~#Gx z|89vO`|k9N?0W!-OGtz4qF+e%J<6gO zWIs?A3LK$Sx9iUs=e;#U`E}~CDTav^HiAXem*vr{z#+l z7g`2J7hy>Ei-mBwM2PN}3K{e=P`WEd>3+E|qaD`lz5Ss0n)BB9Ypsd^ufqtEUyto2zX40(-l*Cj`AsS`$#0fL^tY(mOMWY6l>9a_ zjU>Nag{kCsU~|QgG)jJ#WngqSh9tj72#0%xNPeG?LGK48xnh*$4+t~mTgFRIt zg%d&a2k95l9|CxXGHDQ9b*5x$QRH2(nG zYyKgY;{8aqLGzDQXqtZ_i|{{Hwb%SJ%&7V2WEyGyg$h&6zr^ONOr%lsuPphr45RG&{40?e;!ulfR*QS}AMG*Z2#3RBfv zVRPM)G^$==85k{$A=MWV!eLP%s<#$0=whH$SBz49ah1>3N)JcUqHm!HnlC}OXuc$n zxTQ#g=HgyR^QFymndr$$lVvSKOv_;em6yl%C!AKmQiLn2HmvQH$W$MruM?v|8+j1( z%JT3+x5bPvqi84RaKfn@ub!45r7BE?UIm+rl%!GURV@Rl4j39_H6b)s7b0{=A%k`T zCA0!lznz7}PdKfC3!<$F@X}S%AewmOiI#t1buDYqH8w!IZkB;&cZ{H24{WbpPb`t{ zrP`ofZ!%H4KJp-pzVh(et&JJ)8eT`vLAz0@cKuYCYFCEMMM~1B-FlXRRDTR z8wk;EfRI54g3?ZbNxKb&#kCuR3)*c2ByKQi&`vyxXt%L7*d#VUyG<Qj2ET1lyf*)cU-F7NEN2qjl$+4C27=djAbCT z6^69iS_lmtq@>+8LI&Lyly(YC+HEKNd!ESOp03b%2Ox1fk_L^%w}{4Lt-(&Q0UB3W zhH%DV1dYdI`_uXvECpAo+Mw|SGEw85581!i*YM%Q>9Z4;oKWVXE|xn zu>mu&n`H=kcZ@I-dtm$3o?uCWJyjcKVlOgrCia#GqU<9NKNI_6#`}=>lXF<@Rq1Nq zUxn#R9DvOwP0~0M2U!ME2V-a^4iQ4*P$4sMn2F_5@RNW)AhsvGMN#ji1Vi`!?ilLdfO$d$Kh0MeqLI%AP z)J!Na&BR^8xxWx|H{GD`JwW2_B@OzDYY~0#vj+Fa2I%{MWeDX#jG*sB*k0dNyPQ`@9eu zF9^~1MInQ}1WI28CVgKP&b_{~=mvdX0TTBrY0y_(i|G5BHF!NXK;JhkLnv=z1byGa z_Ir}Iu@u-lstx+SOD5|3o;(QkeR+6&KfsLoekkX#Ckgs~q{39+kFmL+NgDP2)H0Cz z3`6>UE`-JxLiGJo$e>?=(pP~=->-%L5gJDnbTr4@x@)Chb-g z7T2x=E@-zJkhs-JgLdLkM7xgGpi^vscAYH)%{4HBc57mL?Ydxz^jfM7+I1xpwd*Di z!ssp!uU!w!`2LBWat_+vo@&=ig{gMEvH6HEY1FQ-WgxXShO}Ep2#tP1v?~)b=(?b^ zQ()3=Jz;U}`s0Fj>jR0~fHY_)9!0bpU=0Sw257gTWuQ3-BWSk~wm&)z#uDj`RU5S1 zgiO?KQ+W`^X7cdbZH^h=KQTnk;ph~!+d_q@c0;lGb_QwGZn$M2H3CE0Z7GDtNFmyd z5;Ev$P}(UlX*WhV_eZC#=mvea1`?<9%t2pqEu!x>)?nM%0DZT!454g~5%k>w+v~d{ zmI52A+Mw@FWTL(m@*vc4^6>hO$Bges$jCY98@B686{h-5z~&nnq*33AmVs0ihV-o# zLSvE;eJ2YUbP6ba6`1s`5zf87wRD5NQvu#+N*eSP*CP5lYfu*(pl`ip2xS^Z(05mC zfApV@rNCyWHt0K(Ow@Nbc@XOE^6>iZff@BpWv{X5vgCgPsLyCKQ-v;%wpEuk>^127S*3c!w%!&{tfG z=zG33xF9w_-wQ26C>LP_eJ{rLEBz8I1$L=wgT9xMiTYkH4??{{9$w!oF{8d$$vLd_ zpzqZxO!d76n{R25Mt!fd45Y5dkiItvp>d-SeQy#n=*^(?RbbNh7U4g+(r;xzX5uy= zakrC(nNUGlgLZeM+P$N~RJ(Vv`CtZV)b4%DKpzmU2qP~mEgHV@{hu3#W%&6~Dat?dgpzqQuO!Zv` zo2z`JQQze(1F7XPr0)tsXsjqi-<5<6+6I)q3QYR0Ec_?;ux%NTnP>+ju9P&)grX`k z6RTK*_OSsov8rVVx&ua-iPf;5A%pe-H4_Rl`mSdgLg|kY^j#m@uk;PD6xaaO27L#TiTZ9R4?-Oz53lb= zm{H%satKx%Ug={rOSjV*-eJ5w#N3yL*4r!3ARyfn2Bx4R6n^W zHHfsGJP>7jdH9*w0W&^AvLl&zJY2jr&i|*o^Nw<=c>g~ly%#}gvY-ekuz;Y5s93;) zq9{?U%kCzSgzRRSWGUjc7qIupgR4SX{n2p0ghQ_?_sypP6~) z&hxxxa&wbQvJk6KW4sbGvAO$58CIgoRtTyZLz5(>gprc660@XCIvdqWC@~#3EiL_e zn85{hStK%ZC_OvHQG#904yXwOU{`A^gqg?i?CP-HSz<1hf;Q^)>hCT9Cemj3?4Vb+8E7GrqmOR(LBJseBf z9-&?j{YWbAIPf@19^`+tJRJ06FvIUp94lvc0oUO7CyrBVO#OIl?jTYI>L=O?QJsV# z>L*Ky;}j{>Pn9z3X{e|xT~R+>T6)KxfeS>>L?Uw*r6;O5mLVE{N#tznc}@e*<)b{; zdJyz^7#`*M*lzz`fTa{JRIf*Q5tV@QVtJ6%CGv16FU1Vc{mbO+_V3c~_Tw`EGfT<2~|lVDH5Yzdv!G zoc)`O!@A)Nfcw=LgM9#-TYr=R>_fIfP!D5hl1HS3@u(EAk4c&Iaa3THn2!5|wDcBz z5*MI7g+%6QN)JtOECX%XeN?`Yj zJV@hJc{p~jVTON(^17ToyUSyCZ>TY5_a-*C^(X_ow{3->-oX&Nccp~!o)mWPOPTZo zRP2q@~&YjSK9W@nw(5tVHSADUK5Cn%e;@hXJr_VJn2$62r4=h3!s; zt+5nz8})j2ZK(uy?c_lk?d9Rvb-)a_aXZS{znFV=ozxh!>x|8fILg4TtE~`JHw>}s zE+vdrq_FEDWzwFg*eNlwTUFZhli_L{2EM(J$n>W4d=+a6zJ2U~zF`1-``HSqtd8ON z_Q!U7%dnK#0QGvl1E~bQYsiCC*OZ6jI|wuUKEhgZ_I&;GdaxQ}zC*CNSw|W8u5Bv> zwGM{(4wDkba4CF8NSU-86<;MLz9Xeg=R1nSz;`qfnRO{WU&UI2?-)B^Y#0FF^=ySy z*2nOC$6>p-R2yI^vGMBld^e;L_)d@qscs|>$9H4Qz;_cl`?pk{??g4md^g4Bh8|_$ zySc3p)D{@xJ4s3ylcn(8Qp%)Tq2jB=#CL1yihN784HL2wQ;^7POX*iaS(R9c?d*W5 zVE`+!y{(Y+4j6tVreV9Cz9W_p?4(}564R-Kl}N|~C_Br;t;8;v;r9{r-L|mP{j2}3 zYK&K6H*9YGQHGV+!&V4tPYkWZUQ)uSkg^gprA%6hY9*AIR-#JU^qpSKVc?rYB9o%@ zd=+a6zO(Fr*D)3!n?84S-ii|uy$94sZ4Q?KV+LnZL7l?SQj<>C0&VFtc)yI+!B|3Yh97-j7OHX=$beKGVvREE& zC6-`@HxP%**%)Zv9b)l{nf~2(T1FpiV5630uK^aNBZ zp~Q6D6Q!lEH%`I@b|)kJX+%oTPH~iAcd8w5S{MMk(`|(?&%p5P&ct?SiLXY+AI^NHu&J+dfQ8G zH(+?+H)1>BH(@E$o7L-q-=aqQ4WV0Qk@#)ucC>HDoYE)$35q+Y#I%>b)xA@VG3~ps zxphYwXy0QiM078PXx}F#hWn+^en85k52B*2G)4O%X;XiKB5!IdlX>$n#{&5yNMs(R z^vD(PGRWgk7ap^ok2mma%=!u2OJ+}Ec-Bv0JJwHQDbHur>sddmM$7s+S)~2Ex*h8m zFazrssWf8!k{V;yFJp77k20`+)mDh;H4L$ST}ljZNMZe^lu6%0#ad~K_1n^>{|ZG+ z`yGx3?RSyLyhrJ2E9B+Te&2e2(7>}X?GJ4)xqXD;X@89EXn%sGOg~kxr~R24E$z=` zk@y$tcC^35479(Z(unrgYK&=rgU!uB%0T-&TOp$FF+}?ZDKY#gh4xQUCjA)|ZKWyN zzet<-LliOUUpW-0e?ubkJEcdhc$bIz59|471JA~&|FXR#_BVz{-E4c0dL=BS*&Ge1 zS5~7%-9i>ww^X-7-3l|HZcU{T>NaYOQMbkBJ|Sg5-QHG+r~`&jca#!CCn=~qOPRC_ zD%46-sJp7&ow6H$x$|HA7DbG?8;1dNcO){aP6L~<}xacFb_~;jCmk7HvuUF<~41Fhz4N@ z^IB437%Tu3iI01|Mur7V)E;7WXKOgA~T%QlUMl5BR|4=mN)QhOn#*8 zCC^b9p8RNRM}A!_Wj#i{p8QxfTJr130>b+0cI3xl2J#zFX+(a!8e{SsVsm?tGLYZM zR)}b043XbNN(>XFkl$3wq?@54uQWw|bLoHlixe^XEjTpjCn1rUOzF`p{^gt!*!fZiC^`Pr-KRx5ZN0+o{*1pQ=WSetTI^*g@S6{WQ#gen%>e(C?(i82xl? z?gvr^^gG)M5$%E@^fRQyu&WgGyGfaJcU0(=rqJ&p{qKI1BBs74M}_)cNMtG~J#~e? zJnA#8XJrG=#?-59FF96YcRHS{eGZjI)N^W# zsn=k0Cy_Ex&)W(S)nSPGTq!XaDbx#6CM}|(t~5oxUix4DE=A0J9><0Id?YdpC_Q%t zzdY^>t>@kiJR5UgWP8bS9}Leu!gk#E#Zu1usn>JgUyYXg0kS}Fpt>FRgD?a4gQ+y) zeux@l?uTMW<}k{@eX*?&(Gm=CKU_)-M@Zp*q?AdILd9Kaiu=*hfAxj^fA`ZAG4^9P zEZC1lB6A$2$FA6yhy8f#c|rrv#@J7^y(D=OhR1#~w!?l3mQp@dy&n5%YP8r-mj!_{ z)a|gJi5ak;MWqq;v(*@5KLU4E|CM4EW2C$Xrh8!7KXZfxp6fUfIC2G5D)&FKJ$l;lW>n?ZE#JOG#g=UJw2{ zHCpi3%YwlT>UQ97#0=nXqS6Tb&1#In--6AJNy-5JHd`U0+c50t~{`4MdQ ziPWQ5%J4DuddiPe$);DM2L?~bgPfm~hXef-X83`Mr{(NFk@}+-&H#BvjWOtFvAK&$ z89+a8D+Kidh9-GYN*FIm0sXR+Nnb$)T8ZhnuS!dQBJ~lYWbeoe~qf@1&*KeUA(5en2Ag zBc*4jI7+bl$qx8A41nD)wnCV{Vt97HVY_Gd?^p`@5A}L>e^LqT{*ni2{4Ed1uGtO@ zUnl;2X(cN06PzD8h}kt)W6W-4Z0=%G26ioNg`iqth+S(bVYHFLuC0_w+o58o#Kf+> z+W(uc?04W$Fz$#%rW2)StawW>?raBi2?Jo<)mBKS8-{1x9ov2GzY3O;>!DuHxF?ms zcvX3j?rQRIjC)}Q#=Yh2Klk^H`=~Ky+!vcWnUsO?>b62q{V~M2OiCC7q%a;RWzscJ zF;-$?yry(Te(pbr30aA?kjMh&v8P9?0wNO=Hdlsw!@jK&QAP zASI0PQdVL^DU(h>wGv89E3uLEzuD~@b0`>Zf<$H_rDv>oOEBKl4%jRVfbr(GLONSu zc*c{k-ENm6-T0mNuR55)K33!;#1wLFxG_ z))IV=v;&R`1K@kKt&qww7@qI3*zQbn9F`J0UcH|02~+~#6XijwC&|O{JsC6bJw?v` zOyc>Ts>Yb_Y1rKHqzrt|uoZ$j6GME@k`l(*Quv-DWzus|@l|5td!BSfo=MJULRR7e zBr+FL`jt>tC061hJK*9lfR(t!R!I6%48IbWVY@5r%dv#u3ibMxxROeCOh0;nbd@}S zaBuf%oOk-45Sti%nrLQpqiXp)fE-X<-5g?&3Nu)70^%$<~;o#H6L?k+pv?l1s$_t*+y-izVc-G}Yi-H)Z9 zA5gDn_aK$P?jd=Q#>4V(>>j}kKTz?goISft%=Z`{cHh_m--ZFO`_5Jf z^Lq@>?gwo5>hvR)g8oUpp54z>0=r-2K^nix!?F7fGyFis?{fC9PM+N#YK+P_a{DV%JjbO@DQ2#bMyv8i`CBO3zoZmf+jg z4rmt!z_-1vkV*#(&$lDCKiFH=5=i7x!;M-Lmq}oj$j&FC&@B<2~$l3Gt&+8s) zjQRG&j?Ai*f$wUzLQuUh#J9JUF#1U0+gHk@{ZR2$V&c2HwCQ~Na~SxRA(0tC>G>+w z5_|{R0c(T-@LkhZNM#U)=eriRd-WfTrNoA)*Yh1pCGcHa9;CXCJRIL)n1SzbIr~?C z&v%3xW4`6skr_!D_>Qs_f*Oq>zUxW}V~iBOW2H>G9xA>{OnlduuE0Lm8fa4Rth zGyH(UWI6kt?qB`4RAamnTVY3LYs#<^+t><0O~KGgY%3*QvXjQLh#N2ZE0@U6BLf=XhDZ%RrSv!w8yEoIU)D!xig zd^6G&xzn>u$V$vXB9o)^E1|4PtVE3+P#XrY5_wx8={gL*5_7TL^@hO`f`WSeN))MN zCzR0xq*J6?@3yA!Y@b0TG6cap6T z)X5lPcZ!rSPL;y$G%1swj*6WU6T35{rP-Z{3+&E9B6BvSXQwzyusg>NI5!M{-Fdb` znCD}7b{Al~Gwg*}3i=}TdUh963G6PB2Wea?56A8@% zZVdzAdz-D0%Iz4Q?;Y6g40|V*61z*ip6}gM0^fV&L8|x4!|}ZjGw{7%&i)MR`97e= znD2ww+~uPTd>^(If_el)d>@q(#$!_WJ}za_Cs6TKV&eOxbVZ(FpJGB*;%Ou@&rtf6 zP*x>Y;#oW3xiEm0c-~e>`UMQX5-(!Ao&FM*5WK8jzY?!d2`llcJb?0=JlsmWju}3a zd_&HDr~5PPn`(?#;w^0M8B&Ioc*j-<>Rk-2#CuZ0cwfp&d?01g4^gdz64Oe2ByIXm z|CqzT_Y)*CpHh0hinRpa&+LHD!vOexVJoEaC5Gqw6}H>yUt=k;Z`AAgeoH0r{Z1aF z`n^0H-ybjo-yh}dce>~MlNw{bKVx%Wkuvc8)m8}VHw^LpT}l{#Na6dZlu7?W#aD@m z@88lDxzn5NXjft-gg*;O=~qHol~{?D?SK|x04vebR!F)PhF^)+*zWbP4VDnJRj*%( zc2u&*tw|4%+RFnd9pvFwq9bPbj!7pu``5$gH3(vz)flft7i{i6Qihf2W-A2M9Yd3> zA|;F-QdXj;lu1`bwGv89$6ZZY`t`6EF6`poNM!m@dUlGV1iQX=K))~mcB|V8VfM%H z?8>m+Sz-W|f*z<|&u$GWf!&(&AdNxtaO~E?4Bs&sEN6d~@a%@DF=jUuoBM^7f!#W` zLQumn#BR8hFh)pWS1x7Jk*L@yF|ivZZTeYaG>3ujx=3WkPcEEZK20TBA zfF@?&mMr~&iuJ7r`HjQy&^N$#8+JUFvfWU<9{L0-?l|z+NFL5aAEJHN@3dvOKxqSoA<)hredJyz943Bb0Y`1@R!cq#;)$36vs05Td%Y&qL zk%vP$12a7Lca^i-ze~Thvzr=YlDlJb2aqz5+|yPFYA+0ttdJ7MOerKQrA%6dilnj? z$!clS_ivKJKs$v*W)`KVtyq^wd$#pV2Tx868CxNTEQSX=2ixt@9F{VwQLhJEOC{TB z2tDMSmj^l4$-{x2iy3~P!pPa5RJR$5GXM%|jKLPMx%EdGz|ON3f|`$^Nft;6W1$qV zdrO&g5h}1sOvl|vT6&8{xBzWmBr^L^dT5Gc8EDJ?GpYUUfCIt+*d1sqgn1B#XLm5R zV|NIaf<9Eep50+o0=vcXAdMyRaO@7p4F3$}2swLpH8Hy*)flro3Y*({l!4tbwn9+H zVu;;wQo=Z13cC}eOnM?Jc1ld_PLh^pcQP)pI|Yf%sg$0b;wZuHG&|t*FaUOE*a~5u ziQ(Cuh3(j#jisQ^QLkrrE|tLUJb94D`SNh=F2D?zRTs+HvpXnecaa)nb{AuFBaSk# zyVO<)>M{(myIe{bS4d%ZrIbmpLd8yriQU!G((JCm1$O^KB6BUJXQwzyu)EF+pR^THc?!exeHz>GeFjU3J*!^N_cz@O{lz2F2Wy*ZW;tgK$Y5-q5Nm1rps zptO>QTZz_~;Rh7j$l337|LWgXjqysf!{*i>Wmt(0wn9)HF|-n$q=eB~%1U&RGHF*- zE1|@+65Z6^^qtyI+<9b_v6wHAi>4we$e5Gj0z zN||(RRD6|~_^u;ekvn}D6S5M+k;sgo^edsPN~}b=9WXKsU?oP`3Q3Q~@GG${w!7XK zgCzuG)$3PcJu2Bn!|4Ii`tktEIC;30*Z?!Uffz4mf4%Xj20?5?HO4D30h?QYlwl<{ zwiSZf1VfWdloH0KQdVL!DU)uFY9*AIj=P1l^!3IhTwpgDiOiOio}J<-!EP%%VCygd zcH7trVNSvD?6$>rXNm2w6!cW}dUo4W3G8-|2Wd=`hhw)RX87=6Cpr7Ggl9KhjWN3f zHn;UC1G`;pg`j3&h~2JI!q`m;yWOQsx(6zDN=)qbls5e=u@{GdZv_&WnUtQdVqHGp zRH9RLy)miUVnrceZ>m$K65pwbcF9zA-c%Md`C3zDTe?-&7xT07`C@Ipn5rlgD^1Z< z(=%nIL~H%A^h~l~lGOPD9m*l;Ryihbd91>t2alfVY3WsYtd^}9fom@wy?ONE(U(U*9;@@{ z&!ddT03HK*tifYV9)ozSmA*PXn8y$vLwT&tV;vsDcns$;f=4-zk=e8LI~}9aqw2Lt zvz1nLGGAR^%;X9qYV*ldpNys1S-!Sx7y7oTuPqxr zwrtes@nc7hA2X(G^vF?TMzq^CUtd;TSzA__tgI`R71No5J!BbC)#XyfRBmBeF<-Wj zg)Pfv=45JT4=byxFP3GBWrcLUK9?-3ESBX`#6li~mZ{|!sWQVNm(48ZtBWR;npu|2 zm{fH!GcPs5%ptGz_;mC1M85bnDbYI4-sIHIv$95cC)zHk$&D}6RkE3CX-KrGGpRz# z%uAWP{CFPJNqJt(mGXQsQl2jbDbJ50TA!XirDZz7WU#MSNAmwWp7ThHC+vKL@2*n% zC#<#+Pgp*Y+Bm%-+iIcp*n6pmUxV~yabILR0J#r_Kt@sk?<)oPerQ(DtxDnDU#*=g zMYz8wd;o1j(leOrK&;3dWa}Hu=*AY_+C5Lpc%GKU&(ni-2)<-0v6~^ihXOgojv|ml z)j=SKNeN`Jlt7k93E^;bnfZ@UNAmxg?nrt8briy93zUG$#xW>f%j%!c&8qqwPlAeE zhW%}h!HeXMwMRJ49U-x73W@d&MwsLAQA#JsH_^&na;Lk-jTU*(jBpqbQbM=@C4{Lyf(xnpm#~Yl`Hdw?;fyC! zRPkgTnqxBACDwz$0sT_$C+%cV?qg_OyzL|wi-XRo4C?M`STDw9cfzN|~JmuhEM zEFjZ%=4xC3aSg&RDp59wL&3%8nGOv{nQPTSRM*Kr(V7Dl7uKcB^;Bo@*J7K|U~Zsd zyXIG#T5}_{#fi4^tTeMzMRSvU`AcQZJZf{Z2FN3sui-psZjpzMRwyRTtyGleZBo*{ zUC!-sPA#a*WvVkpa|bO;v;*#x3xw{HLga3_wz9{qHutD;Q2=x=)qn2UR83vFvXCjX zGxyO8oBNT-JU|)Pko$wS&U_DHXugNlkZ2*S<`L|yVxH03B`{pAkJ6A*^p9aEo5!Vu z_ynqp5v_vGwNFZu%i?*8HlBY^BitOOBpCbbQF!*sBGJZ&Zk}~*_BqKZ%y0MS?BM6! z;2E6=&29HWs?t=aXSOph(6#*C{-Pa3x-ZFvbYGT|%PUfHc~wd-ub~Zh`|H&GZhr$i zGH+56{EUwOoZq}f57R5mf9(Ia?HHziM}18Hu9WHDlQRALQl|d^)$$G$#}BDw;~oAH zc4R)L)GEd^DWG^Jzo$Qu$I?ChDb=v2KckYhTRCg@FK2>gj-C0Ou7vO-;&}=8T@2=ol_Qn6q< z+SX2#I)^7Z`0MptrZ#0d(>yiNE#y)`jD^bC1lq+8>#AYvaUSW05t;6kjuPv%imk9t zJuv)xsGivFlYmvRv|mHz52aP13bIIY}3rc8A7%jy=qoHqXPv3k1b z&5$m%D_ryiGs+Gdt+7f-z z#bVv~^73Ln&)c6&syJ&z-pnpf7i)6mX1qMwvJIV^**IVNd#RJChrL57bGI9JsdVv0NI&@B_KcuP4eGuuqJhqPls0<#qNU=gJ(+pKUo=@-xzy&mnop9n&~s>*n&@OV<$N(ECx+mZy=`gKcBJhikX`o|}p`Sa(Ga3R?f4^fumTqrkrdGTt@M;Hq# z(wW)m9RC+hotj(Z^0l+gT$z2BMPIS(^Vi^#wa+Ww85i>vOIa5*xOpaNiZVKZqv4*Z zr*TQ5k2`0iaw&btQ(#Ss>5A(33^ETFo`LaV+Gke5%%_omMW93Ww9mCnEgzET12@h9 zTKl9~NatcM)hg$QroCy>D~#nCUKJM6%7;ve9{;?oa39m{qe0CQE9)b=2%BG4rsN~K z>>~Z^pw`(B^`*Er*{UAM+UYma?Xs_R!EB#>r4P~}dka_V>5kd?Tr{VuFG&`XM(m7i<0a+*e$0%f2 z_7dLGr-x_DH$+BcTPy4G?1OyzXFmeW+8<0BmED)0;i*q_NRf{LSu1x{xSyrE zKV^CnS7}^a9bgG_MRTAUxq>-J$`#GQXt&1u}A`t?OF7Z|1gRivOgXi&7IyQd1Pl zGfOfQ60;I3a`F>X^fL3(@);C=vM_KlFfb_o=k{|A33hf2a5d61U}gjg=>Rd%XaNQW zW@Cw{|b%Y*pl8F?4B9 zlo4Fz*0kZGJabY|>}Okf0}CCg{u4`zEPY^pV?j2@h+|igy0+Kz6p;@SpM4s6)XEMg z#3Y4GX>Hjlml5ftdH$4x0JGdn8~MX(U~_^d!Hi)=HU{V%g+mi8#UGbE-*ao8f#h+S z2a0-5+vc7MU$e-NhmBjLIC1v|)9+Im8x1yacJ7{^tLX(ZhYi^rpmXm0`@ku9b53aN zEXH@Y3JaztblgpxbJt{AtE1ad1Ca>{v$rwwvK(>{m~Gf_=-Ro7Fk{#;i~+{{>QtvI yb2P8Zac~?~=sRA>$6{!(^3;ZP0TPFR(G_-UDU(8Jl0?(IXu$~#4A!880|o%~Al1tN diff --git a/docs/build/html/_static/basic.css b/docs/build/html/_static/basic.css deleted file mode 100644 index 967e36ce..00000000 --- a/docs/build/html/_static/basic.css +++ /dev/null @@ -1,537 +0,0 @@ -/* - * basic.css - * ~~~~~~~~~ - * - * Sphinx stylesheet -- basic theme. - * - * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -/* -- main layout ----------------------------------------------------------- */ - -div.clearer { - clear: both; -} - -/* -- relbar ---------------------------------------------------------------- */ - -div.related { - width: 100%; - font-size: 90%; -} - -div.related h3 { - display: none; -} - -div.related ul { - margin: 0; - padding: 0 0 0 10px; - list-style: none; -} - -div.related li { - display: inline; -} - -div.related li.right { - float: right; - margin-right: 5px; -} - -/* -- sidebar --------------------------------------------------------------- */ - -div.sphinxsidebarwrapper { - padding: 10px 5px 0 10px; -} - -div.sphinxsidebar { - float: left; - width: 230px; - margin-left: -100%; - font-size: 90%; -} - -div.sphinxsidebar ul { - list-style: none; -} - -div.sphinxsidebar ul ul, -div.sphinxsidebar ul.want-points { - margin-left: 20px; - list-style: square; -} - -div.sphinxsidebar ul ul { - margin-top: 0; - margin-bottom: 0; -} - -div.sphinxsidebar form { - margin-top: 10px; -} - -div.sphinxsidebar input { - border: 1px solid #98dbcc; - font-family: sans-serif; - font-size: 1em; -} - -div.sphinxsidebar #searchbox input[type="text"] { - width: 170px; -} - -div.sphinxsidebar #searchbox input[type="submit"] { - width: 30px; -} - -img { - border: 0; - max-width: 100%; -} - -/* -- search page ----------------------------------------------------------- */ - -ul.search { - margin: 10px 0 0 20px; - padding: 0; -} - -ul.search li { - padding: 5px 0 5px 20px; - background-image: url(file.png); - background-repeat: no-repeat; - background-position: 0 7px; -} - -ul.search li a { - font-weight: bold; -} - -ul.search li div.context { - color: #888; - margin: 2px 0 0 30px; - text-align: left; -} - -ul.keywordmatches li.goodmatch a { - font-weight: bold; -} - -/* -- index page ------------------------------------------------------------ */ - -table.contentstable { - width: 90%; -} - -table.contentstable p.biglink { - line-height: 150%; -} - -a.biglink { - font-size: 1.3em; -} - -span.linkdescr { - font-style: italic; - padding-top: 5px; - font-size: 90%; -} - -/* -- general index --------------------------------------------------------- */ - -table.indextable { - width: 100%; -} - -table.indextable td { - text-align: left; - vertical-align: top; -} - -table.indextable dl, table.indextable dd { - margin-top: 0; - margin-bottom: 0; -} - -table.indextable tr.pcap { - height: 10px; -} - -table.indextable tr.cap { - margin-top: 10px; - background-color: #f2f2f2; -} - -img.toggler { - margin-right: 3px; - margin-top: 3px; - cursor: pointer; -} - -div.modindex-jumpbox { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 1em 0 1em 0; - padding: 0.4em; -} - -div.genindex-jumpbox { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 1em 0 1em 0; - padding: 0.4em; -} - -/* -- general body styles --------------------------------------------------- */ - -a.headerlink { - visibility: hidden; -} - -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink { - visibility: visible; -} - -div.body p.caption { - text-align: inherit; -} - -div.body td { - text-align: left; -} - -.field-list ul { - padding-left: 1em; -} - -.first { - margin-top: 0 !important; -} - -p.rubric { - margin-top: 30px; - font-weight: bold; -} - -img.align-left, .figure.align-left, object.align-left { - clear: left; - float: left; - margin-right: 1em; -} - -img.align-right, .figure.align-right, object.align-right { - clear: right; - float: right; - margin-left: 1em; -} - -img.align-center, .figure.align-center, object.align-center { - display: block; - margin-left: auto; - margin-right: auto; -} - -.align-left { - text-align: left; -} - -.align-center { - text-align: center; -} - -.align-right { - text-align: right; -} - -/* -- sidebars -------------------------------------------------------------- */ - -div.sidebar { - margin: 0 0 0.5em 1em; - border: 1px solid #ddb; - padding: 7px 7px 0 7px; - background-color: #ffe; - width: 40%; - float: right; -} - -p.sidebar-title { - font-weight: bold; -} - -/* -- topics ---------------------------------------------------------------- */ - -div.topic { - border: 1px solid #ccc; - padding: 7px 7px 0 7px; - margin: 10px 0 10px 0; -} - -p.topic-title { - font-size: 1.1em; - font-weight: bold; - margin-top: 10px; -} - -/* -- admonitions ----------------------------------------------------------- */ - -div.admonition { - margin-top: 10px; - margin-bottom: 10px; - padding: 7px; -} - -div.admonition dt { - font-weight: bold; -} - -div.admonition dl { - margin-bottom: 0; -} - -p.admonition-title { - margin: 0px 10px 5px 0px; - font-weight: bold; -} - -div.body p.centered { - text-align: center; - margin-top: 25px; -} - -/* -- tables ---------------------------------------------------------------- */ - -table.docutils { - border: 0; - border-collapse: collapse; -} - -table.docutils td, table.docutils th { - padding: 1px 8px 1px 5px; - border-top: 0; - border-left: 0; - border-right: 0; - border-bottom: 1px solid #aaa; -} - -table.field-list td, table.field-list th { - border: 0 !important; -} - -table.footnote td, table.footnote th { - border: 0 !important; -} - -th { - text-align: left; - padding-right: 5px; -} - -table.citation { - border-left: solid 1px gray; - margin-left: 1px; -} - -table.citation td { - border-bottom: none; -} - -/* -- other body styles ----------------------------------------------------- */ - -ol.arabic { - list-style: decimal; -} - -ol.loweralpha { - list-style: lower-alpha; -} - -ol.upperalpha { - list-style: upper-alpha; -} - -ol.lowerroman { - list-style: lower-roman; -} - -ol.upperroman { - list-style: upper-roman; -} - -dl { - margin-bottom: 15px; -} - -dd p { - margin-top: 0px; -} - -dd ul, dd table { - margin-bottom: 10px; -} - -dd { - margin-top: 3px; - margin-bottom: 10px; - margin-left: 30px; -} - -dt:target, .highlighted { - background-color: #fbe54e; -} - -dl.glossary dt { - font-weight: bold; - font-size: 1.1em; -} - -.field-list ul { - margin: 0; - padding-left: 1em; -} - -.field-list p { - margin: 0; -} - -.optional { - font-size: 1.3em; -} - -.versionmodified { - font-style: italic; -} - -.system-message { - background-color: #fda; - padding: 5px; - border: 3px solid red; -} - -.footnote:target { - background-color: #ffa; -} - -.line-block { - display: block; - margin-top: 1em; - margin-bottom: 1em; -} - -.line-block .line-block { - margin-top: 0; - margin-bottom: 0; - margin-left: 1.5em; -} - -.guilabel, .menuselection { - font-family: sans-serif; -} - -.accelerator { - text-decoration: underline; -} - -.classifier { - font-style: oblique; -} - -abbr, acronym { - border-bottom: dotted 1px; - cursor: help; -} - -/* -- code displays --------------------------------------------------------- */ - -pre { - overflow: auto; - overflow-y: hidden; /* fixes display issues on Chrome browsers */ -} - -td.linenos pre { - padding: 5px 0px; - border: 0; - background-color: transparent; - color: #aaa; -} - -table.highlighttable { - margin-left: 0.5em; -} - -table.highlighttable td { - padding: 0 0.5em 0 0.5em; -} - -tt.descname { - background-color: transparent; - font-weight: bold; - font-size: 1.2em; -} - -tt.descclassname { - background-color: transparent; -} - -tt.xref, a tt { - background-color: transparent; - font-weight: bold; -} - -h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { - background-color: transparent; -} - -.viewcode-link { - float: right; -} - -.viewcode-back { - float: right; - font-family: sans-serif; -} - -div.viewcode-block:target { - margin: -1px -10px; - padding: 0 10px; -} - -/* -- math display ---------------------------------------------------------- */ - -img.math { - vertical-align: middle; -} - -div.body div.math p { - text-align: center; -} - -span.eqno { - float: right; -} - -/* -- printout stylesheet --------------------------------------------------- */ - -@media print { - div.document, - div.documentwrapper, - div.bodywrapper { - margin: 0 !important; - width: 100%; - } - - div.sphinxsidebar, - div.related, - div.footer, - #top-link { - display: none; - } -} \ No newline at end of file diff --git a/docs/build/html/_static/comment-bright.png b/docs/build/html/_static/comment-bright.png deleted file mode 100644 index 551517b8c83b76f734ff791f847829a760ad1903..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3500 zcmV;d4O8-oP)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RV2niQ93PPz|JOBU!-bqA3 zR5;6pl1pe^WfX zkSdl!omi0~*ntl;2q{jA^;J@WT8O!=A(Gck8fa>hn{#u{`Tyg)!KXI6l>4dj==iVKK6+%4zaRizy(5eryC3d2 z+5Y_D$4}k5v2=Siw{=O)SWY2HJwR3xX1*M*9G^XQ*TCNXF$Vj(kbMJXK0DaS_Sa^1 z?CEa!cFWDhcwxy%a?i@DN|G6-M#uuWU>lss@I>;$xmQ|`u3f;MQ|pYuHxxvMeq4TW;>|7Z2*AsqT=`-1O~nTm6O&pNEK?^cf9CX= zkq5|qAoE7un3V z^yy=@%6zqN^x`#qW+;e7j>th{6GV}sf*}g7{(R#T)yg-AZh0C&U;WA`AL$qz8()5^ zGFi2`g&L7!c?x+A2oOaG0c*Bg&YZt8cJ{jq_W{uTdA-<;`@iP$$=$H?gYIYc_q^*$ z#k(Key`d40R3?+GmgK8hHJcwiQ~r4By@w9*PuzR>x3#(F?YW_W5pPc(t(@-Y{psOt zz2!UE_5S)bLF)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RV2oe()A>y0J-2easEJ;K` zR5;6Jl3z%jbr{D#&+mQTbB>-f&3W<<%ayjKi&ZjBc2N<@)`~{dMXWB0(ajbV85_gJ zf(EU`iek}4Bt%55ix|sVMm1u8KvB#hnmU~_r<Ogd(A5vg_omvd-#L!=(BMVklxVqhdT zofSj`QA^|)G*lu58>#vhvA)%0Or&dIsb%b)st*LV8`ANnOipDbh%_*c7`d6# z21*z~Xd?ovgf>zq(o0?Et~9ti+pljZC~#_KvJhA>u91WRaq|uqBBKP6V0?p-NL59w zrK0w($_m#SDPQ!Z$nhd^JO|f+7k5xca94d2OLJ&sSxlB7F%NtrF@@O7WWlkHSDtor zzD?u;b&KN$*MnHx;JDy9P~G<{4}9__s&MATBV4R+MuA8TjlZ3ye&qZMCUe8ihBnHI zhMSu zSERHwrmBb$SWVr+)Yk2k^FgTMR6mP;@FY2{}BeV|SUo=mNk<-XSOHNErw>s{^rR-bu$@aN7= zj~-qXcS2!BA*(Q**BOOl{FggkyHdCJi_Fy>?_K+G+DYwIn8`29DYPg&s4$}7D`fv? zuyJ2sMfJX(I^yrf6u!(~9anf(AqAk&ke}uL0SIb-H!SaDQvd(}07*qoM6N<$g1Ha7 A2LJ#7 diff --git a/docs/build/html/_static/comment.png b/docs/build/html/_static/comment.png deleted file mode 100644 index 92feb52b8824c6b0f59b658b1196c61de9162a95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3445 zcmV-*4T|!KP)Oz@Z0f2-7z;ux~O9+4z06=<WDR*FRcSTFz- zW=q650N5=6FiBTtNC2?60Km==3$g$R3;-}uh=nNt1bYBr$Ri_o0EC$U6h`t_Jn<{8 z5a%iY0C<_QJh>z}MS)ugEpZ1|S1ukX&Pf+56gFW3VVXcL!g-k)GJ!M?;PcD?0HBc- z5#WRK{dmp}uFlRjj{U%*%WZ25jX z{P*?XzTzZ-GF^d31o+^>%=Ap99M6&ogks$0k4OBs3;+Bb(;~!4V!2o<6ys46agIcq zjPo+3B8fthDa9qy|77CdEc*jK-!%ZRYCZvbku9iQV*~a}ClFY4z~c7+0P?$U!PF=S z1Au6Q;m>#f??3%Vpd|o+W=WE9003S@Bra6Svp>fO002awfhw>;8}z{#EWidF!3EsG z3;bXU&9EIRU@z1_9W=mEXoiz;4lcq~xDGvV5BgyU zp1~-*fe8db$Osc*A=-!mVv1NJjtCc-h4>-CNCXm#Bp}I%6j35eku^v$Qi@a{RY)E3 zJ#qp$hg?Rwkvqr$GJ^buyhkyVfwECO)C{#lxu`c9ghrwZ&}4KmnvWKso6vH!8a<3Q zq36)6Xb;+tK10Vaz~~qUGsJ8#F2=(`u{bOVlVi)VBCHIn#u~6ztOL7=^<&SmcLWlF zMZgI*1b0FpVIDz9SWH+>*hr`#93(Um+6gxa1B6k+CnA%mOSC4s5&6UzVlpv@SV$}* z))J2sFA#f(L&P^E5{W}HC%KRUNwK6<(h|}}(r!{C=`5+6G)NjFlgZj-YqAG9lq?`C z$c5yc>d>VnA`E_*3F2Qp##d8RZb=H01_mm@+|Cqnc9PsG(F5HIG_C zt)aG3uTh7n6Et<2In9F>NlT@zqLtGcXcuVrX|L#Xx)I%#9!{6gSJKPrN9dR61N3(c z4Tcqi$B1Vr8Jidf7-t!G7_XR2rWwr)$3XQ?}=hpK0&Z&W{| zep&sA23f;Q!%st`QJ}G3cbou<7-yIK2z4nfCCCtN2-XOGSWo##{8Q{ATurxr~;I`ytDs%xbip}RzP zziy}Qn4Z2~fSycmr`~zJ=lUFdFa1>gZThG6M+{g7vkW8#+YHVaJjFF}Z#*3@$J_By zLtVo_L#1JrVVB{Ak-5=4qt!-@Mh}c>#$4kh<88)m#-k<%CLtzEP3leVno>={htGUuD;o7bD)w_sX$S}eAxwzy?UvgBH(S?;#HZiQMoS*2K2 zT3xe7t(~nU*1N5{rxB;QPLocnp4Ml>u<^FZwyC!nu;thW+pe~4wtZn|Vi#w(#jeBd zlf9FDx_yoPJqHbk*$%56S{;6Kv~mM9!g3B(KJ}#RZ#@)!hR|78Dq|Iq-afF%KE1Brn_fm;Im z_u$xr8UFki1L{Ox>G0o)(&RAZ;=|I=wN2l97;cLaHH6leTB-XXa*h%dBOEvi`+x zi?=Txl?TadvyiL>SuF~-LZ;|cS}4~l2eM~nS7yJ>iOM;atDY;(?aZ^v+mJV$@1Ote z62cPUlD4IWOIIx&SmwQ~YB{nzae3Pc;}r!fhE@iwJh+OsDs9zItL;~pu715HdQEGA zUct(O!LkCy1<%NCg+}G`0PgpNm-?d@-hMgNe6^V+j6x$b<6@S<$+<4_1hi}Ti zncS4LsjI}fWY1>OX6feMEuLErma3QLmkw?X+1j)X-&VBk_4Y;EFPF_I+q;9dL%E~B zJh;4Nr^(LEJ3myURP{Rblsw%57T)g973R8o)DE9*xN#~;4_o$q%o z4K@u`jhx2fBXC4{U8Qn{*%*B$Ge=nny$HAYq{=vy|sI0 z_vss+H_qMky?OB#|JK!>IX&II^LlUh#rO5!7TtbwC;iULyV-Xq?ybB}ykGP{?LpZ? z-G|jbTmIbG@7#ZCz;~eY(cDM(28Dyq{*m>M4?_iynUBkc4TkHUI6gT!;y-fz>HMcd z&t%Ugo)`Y2{>!cx7B7DI)$7;J(U{Spm-3gBzioV_{p!H$8L!*M!p0uH$#^p{Ui4P` z?ZJ24cOCDe-w#jZd?0@)|7iKK^;6KN`;!@ylm7$*nDhK&GcDTy000JJOGiWi{{a60 z|De66lK=n!32;bRa{vGf6951U69E94oEQKA00(qQO+^RV2nzr)JMUJvzW@LNr%6OX zR5;6Zk;`k`RTRfR-*ac2G}PGmXsUu>6ce?Lsn$m^3Q`48f|TwQ+_-Qh=t8Ra7nE)y zf@08(pjZ@22^EVjG*%30TJRMkBUC$WqZ73uoiv&J=APqX;!v%AH}`Vx`999MVjXwy z{f1-vh8P<=plv&cZ>p5jjX~Vt&W0e)wpw1RFRuRdDkwlKb01tp5 zP=trFN0gH^|L4jJkB{6sCV;Q!ewpg-D&4cza%GQ*b>R*=34#dW;ek`FEiB(vnw+U# zpOX5UMJBhIN&;D1!yQoIAySC!9zqJmmfoJqmQp}p&h*HTfMh~u9rKic2oz3sNM^#F zBIq*MRLbsMt%y{EHj8}LeqUUvoxf0=kqji62>ne+U`d#%J)abyK&Y`=eD%oA!36<)baZyK zXJh5im6umkS|_CSGXips$nI)oBHXojzBzyY_M5K*uvb0_9viuBVyV%5VtJ*Am1ag# zczbv4B?u8j68iOz<+)nDu^oWnL+$_G{PZOCcOGQ?!1VCefves~rfpaEZs-PdVYMiV z98ElaJ2}7f;htSXFY#Zv?__sQeckE^HV{ItO=)2hMQs=(_ Xn!ZpXD%P(H00000NkvXXu0mjf= 0 && !jQuery(node.parentNode).hasClass(className)) { - var span = document.createElement("span"); - span.className = className; - span.appendChild(document.createTextNode(val.substr(pos, text.length))); - node.parentNode.insertBefore(span, node.parentNode.insertBefore( - document.createTextNode(val.substr(pos + text.length)), - node.nextSibling)); - node.nodeValue = val.substr(0, pos); - } - } - else if (!jQuery(node).is("button, select, textarea")) { - jQuery.each(node.childNodes, function() { - highlight(this); - }); - } - } - return this.each(function() { - highlight(this); - }); -}; - -/** - * Small JavaScript module for the documentation. - */ -var Documentation = { - - init : function() { - this.fixFirefoxAnchorBug(); - this.highlightSearchWords(); - this.initIndexTable(); - }, - - /** - * i18n support - */ - TRANSLATIONS : {}, - PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; }, - LOCALE : 'unknown', - - // gettext and ngettext don't access this so that the functions - // can safely bound to a different name (_ = Documentation.gettext) - gettext : function(string) { - var translated = Documentation.TRANSLATIONS[string]; - if (typeof translated == 'undefined') - return string; - return (typeof translated == 'string') ? translated : translated[0]; - }, - - ngettext : function(singular, plural, n) { - var translated = Documentation.TRANSLATIONS[singular]; - if (typeof translated == 'undefined') - return (n == 1) ? singular : plural; - return translated[Documentation.PLURALEXPR(n)]; - }, - - addTranslations : function(catalog) { - for (var key in catalog.messages) - this.TRANSLATIONS[key] = catalog.messages[key]; - this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')'); - this.LOCALE = catalog.locale; - }, - - /** - * add context elements like header anchor links - */ - addContextElements : function() { - $('div[id] > :header:first').each(function() { - $('\u00B6'). - attr('href', '#' + this.id). - attr('title', _('Permalink to this headline')). - appendTo(this); - }); - $('dt[id]').each(function() { - $('\u00B6'). - attr('href', '#' + this.id). - attr('title', _('Permalink to this definition')). - appendTo(this); - }); - }, - - /** - * workaround a firefox stupidity - */ - fixFirefoxAnchorBug : function() { - if (document.location.hash && $.browser.mozilla) - window.setTimeout(function() { - document.location.href += ''; - }, 10); - }, - - /** - * highlight the search words provided in the url in the text - */ - highlightSearchWords : function() { - var params = $.getQueryParameters(); - var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : []; - if (terms.length) { - var body = $('div.body'); - if (!body.length) { - body = $('body'); - } - window.setTimeout(function() { - $.each(terms, function() { - body.highlightText(this.toLowerCase(), 'highlighted'); - }); - }, 10); - $('

' + _('Hide Search Matches') + '

') - .appendTo($('#searchbox')); - } - }, - - /** - * init the domain index toggle buttons - */ - initIndexTable : function() { - var togglers = $('img.toggler').click(function() { - var src = $(this).attr('src'); - var idnum = $(this).attr('id').substr(7); - $('tr.cg-' + idnum).toggle(); - if (src.substr(-9) == 'minus.png') - $(this).attr('src', src.substr(0, src.length-9) + 'plus.png'); - else - $(this).attr('src', src.substr(0, src.length-8) + 'minus.png'); - }).css('display', ''); - if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) { - togglers.click(); - } - }, - - /** - * helper function to hide the search marks again - */ - hideSearchWords : function() { - $('#searchbox .highlight-link').fadeOut(300); - $('span.highlighted').removeClass('highlighted'); - }, - - /** - * make the url absolute - */ - makeURL : function(relativeURL) { - return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL; - }, - - /** - * get the current relative url - */ - getCurrentURL : function() { - var path = document.location.pathname; - var parts = path.split(/\//); - $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() { - if (this == '..') - parts.pop(); - }); - var url = parts.join('/'); - return path.substring(url.lastIndexOf('/') + 1, path.length - 1); - } -}; - -// quick alias for translations -_ = Documentation.gettext; - -$(document).ready(function() { - Documentation.init(); -}); diff --git a/docs/build/html/_static/down-pressed.png b/docs/build/html/_static/down-pressed.png deleted file mode 100644 index 6f7ad782782e4f8e39b0c6e15c7344700cdd2527..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}Z23@f-Ava~9&<9T!#}JFtXD=!G zGdl{fK6ro2OGiOl+hKvH6i=D3%%Y^j`yIkRn!8O>@bG)IQR0{Kf+mxNd=_WScA8u_ z3;8(7x2){m9`nt+U(Nab&1G)!{`SPVpDX$w8McLTzAJ39wprG3p4XLq$06M`%}2Yk zRPPsbES*dnYm1wkGL;iioAUB*Or2kz6(-M_r_#Me-`{mj$Z%( diff --git a/docs/build/html/_static/down.png b/docs/build/html/_static/down.png deleted file mode 100644 index 3003a88770de3977d47a2ba69893436a2860f9e7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6U4S$Y z{B+)352QE?JR*yM+OLB!qm#z$3ZNi+iKnkC`z>}xaV3tUZ$qnrLa#kt978NlpS`ru z&)HFc^}^>{UOEce+71h5nn>6&w6A!ieNbu1wh)UGh{8~et^#oZ1# z>T7oM=FZ~xXWnTo{qnXm$ZLOlqGswI_m2{XwVK)IJmBjW{J3-B3x@C=M{ShWt#fYS9M?R;8K$~YwlIqwf>VA7q=YKcwf2DS4Zj5inDKXXB1zl=(YO3ST6~rDq)&z z*o>z)=hxrfG-cDBW0G$!?6{M<$@{_4{m1o%Ub!naEtn|@^frU1tDnm{r-UW|!^@B8 diff --git a/docs/build/html/_static/file.png b/docs/build/html/_static/file.png deleted file mode 100644 index d18082e397e7e54f20721af768c4c2983258f1b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP$HyOL$D9)yc9|lc|nKf<9@eUiWd>3GuTC!a5vdfWYEazjncPj5ZQX%+1 zt8B*4=d)!cdDz4wr^#OMYfqGz$1LDFF>|#>*O?AGil(WEs?wLLy{Gj2J_@opDm%`dlax3yA*@*N$G&*ukFv>P8+2CBWO(qz zD0k1@kN>hhb1_6`&wrCswzINE(evt-5C1B^STi2@PmdKI;Vst0PQB6!2kdN diff --git a/docs/build/html/_static/jquery.js b/docs/build/html/_static/jquery.js deleted file mode 100644 index 83589daa..00000000 --- a/docs/build/html/_static/jquery.js +++ /dev/null @@ -1,2 +0,0 @@ -/*! jQuery v1.8.3 jquery.com | jquery.org/license */ -(function(e,t){function _(e){var t=M[e]={};return v.each(e.split(y),function(e,n){t[n]=!0}),t}function H(e,n,r){if(r===t&&e.nodeType===1){var i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else r=t}return r}function B(e){var t;for(t in e){if(t==="data"&&v.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function et(){return!1}function tt(){return!0}function ut(e){return!e||!e.parentNode||e.parentNode.nodeType===11}function at(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function ft(e,t,n){t=t||0;if(v.isFunction(t))return v.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return v.grep(e,function(e,r){return e===t===n});if(typeof t=="string"){var r=v.grep(e,function(e){return e.nodeType===1});if(it.test(t))return v.filter(t,r,!n);t=v.filter(t,r)}return v.grep(e,function(e,r){return v.inArray(e,t)>=0===n})}function lt(e){var t=ct.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Lt(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function At(e,t){if(t.nodeType!==1||!v.hasData(e))return;var n,r,i,s=v._data(e),o=v._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r").appendTo(i.body),n=t.css("display");t.remove();if(n==="none"||n===""){Pt=i.body.appendChild(Pt||v.extend(i.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!Ht||!Pt.createElement)Ht=(Pt.contentWindow||Pt.contentDocument).document,Ht.write(""),Ht.close();t=Ht.body.appendChild(Ht.createElement(e)),n=Dt(t,"display"),i.body.removeChild(Pt)}return Wt[e]=n,n}function fn(e,t,n,r){var i;if(v.isArray(t))v.each(t,function(t,i){n||sn.test(e)?r(e,i):fn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&v.type(t)==="object")for(i in t)fn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Cn(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i,s,o=t.toLowerCase().split(y),u=0,a=o.length;if(v.isFunction(n))for(;u)[^>]*$|#([\w\-]*)$)/,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,T=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,N=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,C=/^-ms-/,k=/-([\da-z])/gi,L=function(e,t){return(t+"").toUpperCase()},A=function(){i.addEventListener?(i.removeEventListener("DOMContentLoaded",A,!1),v.ready()):i.readyState==="complete"&&(i.detachEvent("onreadystatechange",A),v.ready())},O={};v.fn=v.prototype={constructor:v,init:function(e,n,r){var s,o,u,a;if(!e)return this;if(e.nodeType)return this.context=this[0]=e,this.length=1,this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?s=[null,e,null]:s=w.exec(e);if(s&&(s[1]||!n)){if(s[1])return n=n instanceof v?n[0]:n,a=n&&n.nodeType?n.ownerDocument||n:i,e=v.parseHTML(s[1],a,!0),E.test(s[1])&&v.isPlainObject(n)&&this.attr.call(e,n,!0),v.merge(this,e);o=i.getElementById(s[2]);if(o&&o.parentNode){if(o.id!==s[2])return r.find(e);this.length=1,this[0]=o}return this.context=i,this.selector=e,this}return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e)}return v.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),v.makeArray(e,this))},selector:"",jquery:"1.8.3",length:0,size:function(){return this.length},toArray:function(){return l.call(this)},get:function(e){return e==null?this.toArray():e<0?this[this.length+e]:this[e]},pushStack:function(e,t,n){var r=v.merge(this.constructor(),e);return r.prevObject=this,r.context=this.context,t==="find"?r.selector=this.selector+(this.selector?" ":"")+n:t&&(r.selector=this.selector+"."+t+"("+n+")"),r},each:function(e,t){return v.each(this,e,t)},ready:function(e){return v.ready.promise().done(e),this},eq:function(e){return e=+e,e===-1?this.slice(e):this.slice(e,e+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(l.apply(this,arguments),"slice",l.call(arguments).join(","))},map:function(e){return this.pushStack(v.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:[].sort,splice:[].splice},v.fn.init.prototype=v.fn,v.extend=v.fn.extend=function(){var e,n,r,i,s,o,u=arguments[0]||{},a=1,f=arguments.length,l=!1;typeof u=="boolean"&&(l=u,u=arguments[1]||{},a=2),typeof u!="object"&&!v.isFunction(u)&&(u={}),f===a&&(u=this,--a);for(;a0)return;r.resolveWith(i,[v]),v.fn.trigger&&v(i).trigger("ready").off("ready")},isFunction:function(e){return v.type(e)==="function"},isArray:Array.isArray||function(e){return v.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return e==null?String(e):O[h.call(e)]||"object"},isPlainObject:function(e){if(!e||v.type(e)!=="object"||e.nodeType||v.isWindow(e))return!1;try{if(e.constructor&&!p.call(e,"constructor")&&!p.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}var r;for(r in e);return r===t||p.call(e,r)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw new Error(e)},parseHTML:function(e,t,n){var r;return!e||typeof e!="string"?null:(typeof t=="boolean"&&(n=t,t=0),t=t||i,(r=E.exec(e))?[t.createElement(r[1])]:(r=v.buildFragment([e],t,n?null:[]),v.merge([],(r.cacheable?v.clone(r.fragment):r.fragment).childNodes)))},parseJSON:function(t){if(!t||typeof t!="string")return null;t=v.trim(t);if(e.JSON&&e.JSON.parse)return e.JSON.parse(t);if(S.test(t.replace(T,"@").replace(N,"]").replace(x,"")))return(new Function("return "+t))();v.error("Invalid JSON: "+t)},parseXML:function(n){var r,i;if(!n||typeof n!="string")return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(s){r=t}return(!r||!r.documentElement||r.getElementsByTagName("parsererror").length)&&v.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&g.test(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(C,"ms-").replace(k,L)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,n,r){var i,s=0,o=e.length,u=o===t||v.isFunction(e);if(r){if(u){for(i in e)if(n.apply(e[i],r)===!1)break}else for(;s0&&e[0]&&e[a-1]||a===0||v.isArray(e));if(f)for(;u-1)a.splice(n,1),i&&(n<=o&&o--,n<=u&&u--)}),this},has:function(e){return v.inArray(e,a)>-1},empty:function(){return a=[],this},disable:function(){return a=f=n=t,this},disabled:function(){return!a},lock:function(){return f=t,n||c.disable(),this},locked:function(){return!f},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],a&&(!r||f)&&(i?f.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!r}};return c},v.extend({Deferred:function(e){var t=[["resolve","done",v.Callbacks("once memory"),"resolved"],["reject","fail",v.Callbacks("once memory"),"rejected"],["notify","progress",v.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return v.Deferred(function(n){v.each(t,function(t,r){var s=r[0],o=e[t];i[r[1]](v.isFunction(o)?function(){var e=o.apply(this,arguments);e&&v.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===i?n:this,[e])}:n[s])}),e=null}).promise()},promise:function(e){return e!=null?v.extend(e,r):r}},i={};return r.pipe=r.then,v.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=o.fire,i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=l.call(arguments),r=n.length,i=r!==1||e&&v.isFunction(e.promise)?r:0,s=i===1?e:v.Deferred(),o=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?l.call(arguments):r,n===u?s.notifyWith(t,n):--i||s.resolveWith(t,n)}},u,a,f;if(r>1){u=new Array(r),a=new Array(r),f=new Array(r);for(;t
a",n=p.getElementsByTagName("*"),r=p.getElementsByTagName("a")[0];if(!n||!r||!n.length)return{};s=i.createElement("select"),o=s.appendChild(i.createElement("option")),u=p.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t={leadingWhitespace:p.firstChild.nodeType===3,tbody:!p.getElementsByTagName("tbody").length,htmlSerialize:!!p.getElementsByTagName("link").length,style:/top/.test(r.getAttribute("style")),hrefNormalized:r.getAttribute("href")==="/a",opacity:/^0.5/.test(r.style.opacity),cssFloat:!!r.style.cssFloat,checkOn:u.value==="on",optSelected:o.selected,getSetAttribute:p.className!=="t",enctype:!!i.createElement("form").enctype,html5Clone:i.createElement("nav").cloneNode(!0).outerHTML!=="<:nav>",boxModel:i.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},u.checked=!0,t.noCloneChecked=u.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!o.disabled;try{delete p.test}catch(d){t.deleteExpando=!1}!p.addEventListener&&p.attachEvent&&p.fireEvent&&(p.attachEvent("onclick",h=function(){t.noCloneEvent=!1}),p.cloneNode(!0).fireEvent("onclick"),p.detachEvent("onclick",h)),u=i.createElement("input"),u.value="t",u.setAttribute("type","radio"),t.radioValue=u.value==="t",u.setAttribute("checked","checked"),u.setAttribute("name","t"),p.appendChild(u),a=i.createDocumentFragment(),a.appendChild(p.lastChild),t.checkClone=a.cloneNode(!0).cloneNode(!0).lastChild.checked,t.appendChecked=u.checked,a.removeChild(u),a.appendChild(p);if(p.attachEvent)for(l in{submit:!0,change:!0,focusin:!0})f="on"+l,c=f in p,c||(p.setAttribute(f,"return;"),c=typeof p[f]=="function"),t[l+"Bubbles"]=c;return v(function(){var n,r,s,o,u="padding:0;margin:0;border:0;display:block;overflow:hidden;",a=i.getElementsByTagName("body")[0];if(!a)return;n=i.createElement("div"),n.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",a.insertBefore(n,a.firstChild),r=i.createElement("div"),n.appendChild(r),r.innerHTML="
t
",s=r.getElementsByTagName("td"),s[0].style.cssText="padding:0;margin:0;border:0;display:none",c=s[0].offsetHeight===0,s[0].style.display="",s[1].style.display="none",t.reliableHiddenOffsets=c&&s[0].offsetHeight===0,r.innerHTML="",r.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",t.boxSizing=r.offsetWidth===4,t.doesNotIncludeMarginInBodyOffset=a.offsetTop!==1,e.getComputedStyle&&(t.pixelPosition=(e.getComputedStyle(r,null)||{}).top!=="1%",t.boxSizingReliable=(e.getComputedStyle(r,null)||{width:"4px"}).width==="4px",o=i.createElement("div"),o.style.cssText=r.style.cssText=u,o.style.marginRight=o.style.width="0",r.style.width="1px",r.appendChild(o),t.reliableMarginRight=!parseFloat((e.getComputedStyle(o,null)||{}).marginRight)),typeof r.style.zoom!="undefined"&&(r.innerHTML="",r.style.cssText=u+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=r.offsetWidth===3,r.style.display="block",r.style.overflow="visible",r.innerHTML="
",r.firstChild.style.width="5px",t.shrinkWrapBlocks=r.offsetWidth!==3,n.style.zoom=1),a.removeChild(n),n=r=s=o=null}),a.removeChild(p),n=r=s=o=u=a=p=null,t}();var D=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;v.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(v.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(e){return e=e.nodeType?v.cache[e[v.expando]]:e[v.expando],!!e&&!B(e)},data:function(e,n,r,i){if(!v.acceptData(e))return;var s,o,u=v.expando,a=typeof n=="string",f=e.nodeType,l=f?v.cache:e,c=f?e[u]:e[u]&&u;if((!c||!l[c]||!i&&!l[c].data)&&a&&r===t)return;c||(f?e[u]=c=v.deletedIds.pop()||v.guid++:c=u),l[c]||(l[c]={},f||(l[c].toJSON=v.noop));if(typeof n=="object"||typeof n=="function")i?l[c]=v.extend(l[c],n):l[c].data=v.extend(l[c].data,n);return s=l[c],i||(s.data||(s.data={}),s=s.data),r!==t&&(s[v.camelCase(n)]=r),a?(o=s[n],o==null&&(o=s[v.camelCase(n)])):o=s,o},removeData:function(e,t,n){if(!v.acceptData(e))return;var r,i,s,o=e.nodeType,u=o?v.cache:e,a=o?e[v.expando]:v.expando;if(!u[a])return;if(t){r=n?u[a]:u[a].data;if(r){v.isArray(t)||(t in r?t=[t]:(t=v.camelCase(t),t in r?t=[t]:t=t.split(" ")));for(i=0,s=t.length;i1,null,!1))},removeData:function(e){return this.each(function(){v.removeData(this,e)})}}),v.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=v._data(e,t),n&&(!r||v.isArray(n)?r=v._data(e,t,v.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=v.queue(e,t),r=n.length,i=n.shift(),s=v._queueHooks(e,t),o=function(){v.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return v._data(e,n)||v._data(e,n,{empty:v.Callbacks("once memory").add(function(){v.removeData(e,t+"queue",!0),v.removeData(e,n,!0)})})}}),v.fn.extend({queue:function(e,n){var r=2;return typeof e!="string"&&(n=e,e="fx",r--),arguments.length1)},removeAttr:function(e){return this.each(function(){v.removeAttr(this,e)})},prop:function(e,t){return v.access(this,v.prop,e,t,arguments.length>1)},removeProp:function(e){return e=v.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,s,o,u;if(v.isFunction(e))return this.each(function(t){v(this).addClass(e.call(this,t,this.className))});if(e&&typeof e=="string"){t=e.split(y);for(n=0,r=this.length;n=0)r=r.replace(" "+n[s]+" "," ");i.className=e?v.trim(r):""}}}return this},toggleClass:function(e,t){var n=typeof e,r=typeof t=="boolean";return v.isFunction(e)?this.each(function(n){v(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var i,s=0,o=v(this),u=t,a=e.split(y);while(i=a[s++])u=r?u:!o.hasClass(i),o[u?"addClass":"removeClass"](i)}else if(n==="undefined"||n==="boolean")this.className&&v._data(this,"__className__",this.className),this.className=this.className||e===!1?"":v._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n=0)return!0;return!1},val:function(e){var n,r,i,s=this[0];if(!arguments.length){if(s)return n=v.valHooks[s.type]||v.valHooks[s.nodeName.toLowerCase()],n&&"get"in n&&(r=n.get(s,"value"))!==t?r:(r=s.value,typeof r=="string"?r.replace(R,""):r==null?"":r);return}return i=v.isFunction(e),this.each(function(r){var s,o=v(this);if(this.nodeType!==1)return;i?s=e.call(this,r,o.val()):s=e,s==null?s="":typeof s=="number"?s+="":v.isArray(s)&&(s=v.map(s,function(e){return e==null?"":e+""})),n=v.valHooks[this.type]||v.valHooks[this.nodeName.toLowerCase()];if(!n||!("set"in n)||n.set(this,s,"value")===t)this.value=s})}}),v.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a=0}),n.length||(e.selectedIndex=-1),n}}},attrFn:{},attr:function(e,n,r,i){var s,o,u,a=e.nodeType;if(!e||a===3||a===8||a===2)return;if(i&&v.isFunction(v.fn[n]))return v(e)[n](r);if(typeof e.getAttribute=="undefined")return v.prop(e,n,r);u=a!==1||!v.isXMLDoc(e),u&&(n=n.toLowerCase(),o=v.attrHooks[n]||(X.test(n)?F:j));if(r!==t){if(r===null){v.removeAttr(e,n);return}return o&&"set"in o&&u&&(s=o.set(e,r,n))!==t?s:(e.setAttribute(n,r+""),r)}return o&&"get"in o&&u&&(s=o.get(e,n))!==null?s:(s=e.getAttribute(n),s===null?t:s)},removeAttr:function(e,t){var n,r,i,s,o=0;if(t&&e.nodeType===1){r=t.split(y);for(;o=0}})});var $=/^(?:textarea|input|select)$/i,J=/^([^\.]*|)(?:\.(.+)|)$/,K=/(?:^|\s)hover(\.\S+|)\b/,Q=/^key/,G=/^(?:mouse|contextmenu)|click/,Y=/^(?:focusinfocus|focusoutblur)$/,Z=function(e){return v.event.special.hover?e:e.replace(K,"mouseenter$1 mouseleave$1")};v.event={add:function(e,n,r,i,s){var o,u,a,f,l,c,h,p,d,m,g;if(e.nodeType===3||e.nodeType===8||!n||!r||!(o=v._data(e)))return;r.handler&&(d=r,r=d.handler,s=d.selector),r.guid||(r.guid=v.guid++),a=o.events,a||(o.events=a={}),u=o.handle,u||(o.handle=u=function(e){return typeof v=="undefined"||!!e&&v.event.triggered===e.type?t:v.event.dispatch.apply(u.elem,arguments)},u.elem=e),n=v.trim(Z(n)).split(" ");for(f=0;f=0&&(y=y.slice(0,-1),a=!0),y.indexOf(".")>=0&&(b=y.split("."),y=b.shift(),b.sort());if((!s||v.event.customEvent[y])&&!v.event.global[y])return;n=typeof n=="object"?n[v.expando]?n:new v.Event(y,n):new v.Event(y),n.type=y,n.isTrigger=!0,n.exclusive=a,n.namespace=b.join("."),n.namespace_re=n.namespace?new RegExp("(^|\\.)"+b.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,h=y.indexOf(":")<0?"on"+y:"";if(!s){u=v.cache;for(f in u)u[f].events&&u[f].events[y]&&v.event.trigger(n,r,u[f].handle.elem,!0);return}n.result=t,n.target||(n.target=s),r=r!=null?v.makeArray(r):[],r.unshift(n),p=v.event.special[y]||{};if(p.trigger&&p.trigger.apply(s,r)===!1)return;m=[[s,p.bindType||y]];if(!o&&!p.noBubble&&!v.isWindow(s)){g=p.delegateType||y,l=Y.test(g+y)?s:s.parentNode;for(c=s;l;l=l.parentNode)m.push([l,g]),c=l;c===(s.ownerDocument||i)&&m.push([c.defaultView||c.parentWindow||e,g])}for(f=0;f=0:v.find(h,this,null,[s]).length),u[h]&&f.push(c);f.length&&w.push({elem:s,matches:f})}d.length>m&&w.push({elem:this,matches:d.slice(m)});for(r=0;r0?this.on(t,null,e,n):this.trigger(t)},Q.test(t)&&(v.event.fixHooks[t]=v.event.keyHooks),G.test(t)&&(v.event.fixHooks[t]=v.event.mouseHooks)}),function(e,t){function nt(e,t,n,r){n=n||[],t=t||g;var i,s,a,f,l=t.nodeType;if(!e||typeof e!="string")return n;if(l!==1&&l!==9)return[];a=o(t);if(!a&&!r)if(i=R.exec(e))if(f=i[1]){if(l===9){s=t.getElementById(f);if(!s||!s.parentNode)return n;if(s.id===f)return n.push(s),n}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(f))&&u(t,s)&&s.id===f)return n.push(s),n}else{if(i[2])return S.apply(n,x.call(t.getElementsByTagName(e),0)),n;if((f=i[3])&&Z&&t.getElementsByClassName)return S.apply(n,x.call(t.getElementsByClassName(f),0)),n}return vt(e.replace(j,"$1"),t,n,r,a)}function rt(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function it(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function st(e){return N(function(t){return t=+t,N(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ot(e,t,n){if(e===t)return n;var r=e.nextSibling;while(r){if(r===t)return-1;r=r.nextSibling}return 1}function ut(e,t){var n,r,s,o,u,a,f,l=L[d][e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=i.preFilter;while(u){if(!n||(r=F.exec(u)))r&&(u=u.slice(r[0].length)||u),a.push(s=[]);n=!1;if(r=I.exec(u))s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=r[0].replace(j," ");for(o in i.filter)(r=J[o].exec(u))&&(!f[o]||(r=f[o](r)))&&(s.push(n=new m(r.shift())),u=u.slice(n.length),n.type=o,n.matches=r);if(!n)break}return t?u.length:u?nt.error(e):L(e,a).slice(0)}function at(e,t,r){var i=t.dir,s=r&&t.dir==="parentNode",o=w++;return t.first?function(t,n,r){while(t=t[i])if(s||t.nodeType===1)return e(t,n,r)}:function(t,r,u){if(!u){var a,f=b+" "+o+" ",l=f+n;while(t=t[i])if(s||t.nodeType===1){if((a=t[d])===l)return t.sizset;if(typeof a=="string"&&a.indexOf(f)===0){if(t.sizset)return t}else{t[d]=l;if(e(t,r,u))return t.sizset=!0,t;t.sizset=!1}}}else while(t=t[i])if(s||t.nodeType===1)if(e(t,r,u))return t}}function ft(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function lt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u-1&&(s[f]=!(o[f]=c))}}else g=lt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):S.apply(o,g)})}function ht(e){var t,n,r,s=e.length,o=i.relative[e[0].type],u=o||i.relative[" "],a=o?1:0,f=at(function(e){return e===t},u,!0),l=at(function(e){return T.call(t,e)>-1},u,!0),h=[function(e,n,r){return!o&&(r||n!==c)||((t=n).nodeType?f(e,n,r):l(e,n,r))}];for(;a1&&ft(h),a>1&&e.slice(0,a-1).join("").replace(j,"$1"),n,a0,s=e.length>0,o=function(u,a,f,l,h){var p,d,v,m=[],y=0,w="0",x=u&&[],T=h!=null,N=c,C=u||s&&i.find.TAG("*",h&&a.parentNode||a),k=b+=N==null?1:Math.E;T&&(c=a!==g&&a,n=o.el);for(;(p=C[w])!=null;w++){if(s&&p){for(d=0;v=e[d];d++)if(v(p,a,f)){l.push(p);break}T&&(b=k,n=++o.el)}r&&((p=!v&&p)&&y--,u&&x.push(p))}y+=w;if(r&&w!==y){for(d=0;v=t[d];d++)v(x,m,a,f);if(u){if(y>0)while(w--)!x[w]&&!m[w]&&(m[w]=E.call(l));m=lt(m)}S.apply(l,m),T&&!u&&m.length>0&&y+t.length>1&&nt.uniqueSort(l)}return T&&(b=k,c=N),x};return o.el=0,r?N(o):o}function dt(e,t,n){var r=0,i=t.length;for(;r2&&(f=u[0]).type==="ID"&&t.nodeType===9&&!s&&i.relative[u[1].type]){t=i.find.ID(f.matches[0].replace($,""),t,s)[0];if(!t)return n;e=e.slice(u.shift().length)}for(o=J.POS.test(e)?-1:u.length-1;o>=0;o--){f=u[o];if(i.relative[l=f.type])break;if(c=i.find[l])if(r=c(f.matches[0].replace($,""),z.test(u[0].type)&&t.parentNode||t,s)){u.splice(o,1),e=r.length&&u.join("");if(!e)return S.apply(n,x.call(r,0)),n;break}}}return a(e,h)(r,t,s,n,z.test(e)),n}function mt(){}var n,r,i,s,o,u,a,f,l,c,h=!0,p="undefined",d=("sizcache"+Math.random()).replace(".",""),m=String,g=e.document,y=g.documentElement,b=0,w=0,E=[].pop,S=[].push,x=[].slice,T=[].indexOf||function(e){var t=0,n=this.length;for(;ti.cacheLength&&delete e[t.shift()],e[n+" "]=r},e)},k=C(),L=C(),A=C(),O="[\\x20\\t\\r\\n\\f]",M="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",_=M.replace("w","w#"),D="([*^$|!~]?=)",P="\\["+O+"*("+M+")"+O+"*(?:"+D+O+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+_+")|)|)"+O+"*\\]",H=":("+M+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+P+")|[^:]|\\\\.)*|.*))\\)|)",B=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+O+"*((?:-\\d)?\\d*)"+O+"*\\)|)(?=[^-]|$)",j=new RegExp("^"+O+"+|((?:^|[^\\\\])(?:\\\\.)*)"+O+"+$","g"),F=new RegExp("^"+O+"*,"+O+"*"),I=new RegExp("^"+O+"*([\\x20\\t\\r\\n\\f>+~])"+O+"*"),q=new RegExp(H),R=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,U=/^:not/,z=/[\x20\t\r\n\f]*[+~]/,W=/:not\($/,X=/h\d/i,V=/input|select|textarea|button/i,$=/\\(?!\\)/g,J={ID:new RegExp("^#("+M+")"),CLASS:new RegExp("^\\.("+M+")"),NAME:new RegExp("^\\[name=['\"]?("+M+")['\"]?\\]"),TAG:new RegExp("^("+M.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+H),POS:new RegExp(B,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+O+"*(even|odd|(([+-]|)(\\d*)n|)"+O+"*(?:([+-]|)"+O+"*(\\d+)|))"+O+"*\\)|)","i"),needsContext:new RegExp("^"+O+"*[>+~]|"+B,"i")},K=function(e){var t=g.createElement("div");try{return e(t)}catch(n){return!1}finally{t=null}},Q=K(function(e){return e.appendChild(g.createComment("")),!e.getElementsByTagName("*").length}),G=K(function(e){return e.innerHTML="",e.firstChild&&typeof e.firstChild.getAttribute!==p&&e.firstChild.getAttribute("href")==="#"}),Y=K(function(e){e.innerHTML="";var t=typeof e.lastChild.getAttribute("multiple");return t!=="boolean"&&t!=="string"}),Z=K(function(e){return e.innerHTML="",!e.getElementsByClassName||!e.getElementsByClassName("e").length?!1:(e.lastChild.className="e",e.getElementsByClassName("e").length===2)}),et=K(function(e){e.id=d+0,e.innerHTML="
",y.insertBefore(e,y.firstChild);var t=g.getElementsByName&&g.getElementsByName(d).length===2+g.getElementsByName(d+0).length;return r=!g.getElementById(d),y.removeChild(e),t});try{x.call(y.childNodes,0)[0].nodeType}catch(tt){x=function(e){var t,n=[];for(;t=this[e];e++)n.push(t);return n}}nt.matches=function(e,t){return nt(e,null,null,t)},nt.matchesSelector=function(e,t){return nt(t,null,null,[e]).length>0},s=nt.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(i===1||i===9||i===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=s(e)}else if(i===3||i===4)return e.nodeValue}else for(;t=e[r];r++)n+=s(t);return n},o=nt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},u=nt.contains=y.contains?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!(r&&r.nodeType===1&&n.contains&&n.contains(r))}:y.compareDocumentPosition?function(e,t){return t&&!!(e.compareDocumentPosition(t)&16)}:function(e,t){while(t=t.parentNode)if(t===e)return!0;return!1},nt.attr=function(e,t){var n,r=o(e);return r||(t=t.toLowerCase()),(n=i.attrHandle[t])?n(e):r||Y?e.getAttribute(t):(n=e.getAttributeNode(t),n?typeof e[t]=="boolean"?e[t]?t:null:n.specified?n.value:null:null)},i=nt.selectors={cacheLength:50,createPseudo:N,match:J,attrHandle:G?{}:{href:function(e){return e.getAttribute("href",2)},type:function(e){return e.getAttribute("type")}},find:{ID:r?function(e,t,n){if(typeof t.getElementById!==p&&!n){var r=t.getElementById(e);return r&&r.parentNode?[r]:[]}}:function(e,n,r){if(typeof n.getElementById!==p&&!r){var i=n.getElementById(e);return i?i.id===e||typeof i.getAttributeNode!==p&&i.getAttributeNode("id").value===e?[i]:t:[]}},TAG:Q?function(e,t){if(typeof t.getElementsByTagName!==p)return t.getElementsByTagName(e)}:function(e,t){var n=t.getElementsByTagName(e);if(e==="*"){var r,i=[],s=0;for(;r=n[s];s++)r.nodeType===1&&i.push(r);return i}return n},NAME:et&&function(e,t){if(typeof t.getElementsByName!==p)return t.getElementsByName(name)},CLASS:Z&&function(e,t,n){if(typeof t.getElementsByClassName!==p&&!n)return t.getElementsByClassName(e)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace($,""),e[3]=(e[4]||e[5]||"").replace($,""),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1]==="nth"?(e[2]||nt.error(e[0]),e[3]=+(e[3]?e[4]+(e[5]||1):2*(e[2]==="even"||e[2]==="odd")),e[4]=+(e[6]+e[7]||e[2]==="odd")):e[2]&&nt.error(e[0]),e},PSEUDO:function(e){var t,n;if(J.CHILD.test(e[0]))return null;if(e[3])e[2]=e[3];else if(t=e[4])q.test(t)&&(n=ut(t,!0))&&(n=t.indexOf(")",t.length-n)-t.length)&&(t=t.slice(0,n),e[0]=e[0].slice(0,n)),e[2]=t;return e.slice(0,3)}},filter:{ID:r?function(e){return e=e.replace($,""),function(t){return t.getAttribute("id")===e}}:function(e){return e=e.replace($,""),function(t){var n=typeof t.getAttributeNode!==p&&t.getAttributeNode("id");return n&&n.value===e}},TAG:function(e){return e==="*"?function(){return!0}:(e=e.replace($,"").toLowerCase(),function(t){return t.nodeName&&t.nodeName.toLowerCase()===e})},CLASS:function(e){var t=k[d][e+" "];return t||(t=new RegExp("(^|"+O+")"+e+"("+O+"|$)"))&&k(e,function(e){return t.test(e.className||typeof e.getAttribute!==p&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r,i){var s=nt.attr(r,e);return s==null?t==="!=":t?(s+="",t==="="?s===n:t==="!="?s!==n:t==="^="?n&&s.indexOf(n)===0:t==="*="?n&&s.indexOf(n)>-1:t==="$="?n&&s.substr(s.length-n.length)===n:t==="~="?(" "+s+" ").indexOf(n)>-1:t==="|="?s===n||s.substr(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r){return e==="nth"?function(e){var t,i,s=e.parentNode;if(n===1&&r===0)return!0;if(s){i=0;for(t=s.firstChild;t;t=t.nextSibling)if(t.nodeType===1){i++;if(e===t)break}}return i-=r,i===n||i%n===0&&i/n>=0}:function(t){var n=t;switch(e){case"only":case"first":while(n=n.previousSibling)if(n.nodeType===1)return!1;if(e==="first")return!0;n=t;case"last":while(n=n.nextSibling)if(n.nodeType===1)return!1;return!0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||nt.error("unsupported pseudo: "+e);return r[d]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?N(function(e,n){var i,s=r(e,t),o=s.length;while(o--)i=T.call(e,s[o]),e[i]=!(n[i]=s[o])}):function(e){return r(e,0,n)}):r}},pseudos:{not:N(function(e){var t=[],n=[],r=a(e.replace(j,"$1"));return r[d]?N(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:N(function(e){return function(t){return nt(e,t).length>0}}),contains:N(function(e){return function(t){return(t.textContent||t.innerText||s(t)).indexOf(e)>-1}}),enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},parent:function(e){return!i.pseudos.empty(e)},empty:function(e){var t;e=e.firstChild;while(e){if(e.nodeName>"@"||(t=e.nodeType)===3||t===4)return!1;e=e.nextSibling}return!0},header:function(e){return X.test(e.nodeName)},text:function(e){var t,n;return e.nodeName.toLowerCase()==="input"&&(t=e.type)==="text"&&((n=e.getAttribute("type"))==null||n.toLowerCase()===t)},radio:rt("radio"),checkbox:rt("checkbox"),file:rt("file"),password:rt("password"),image:rt("image"),submit:it("submit"),reset:it("reset"),button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},input:function(e){return V.test(e.nodeName)},focus:function(e){var t=e.ownerDocument;return e===t.activeElement&&(!t.hasFocus||t.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},active:function(e){return e===e.ownerDocument.activeElement},first:st(function(){return[0]}),last:st(function(e,t){return[t-1]}),eq:st(function(e,t,n){return[n<0?n+t:n]}),even:st(function(e,t){for(var n=0;n=0;)e.push(r);return e}),gt:st(function(e,t,n){for(var r=n<0?n+t:n;++r",e.querySelectorAll("[selected]").length||i.push("\\["+O+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),e.querySelectorAll(":checked").length||i.push(":checked")}),K(function(e){e.innerHTML="

",e.querySelectorAll("[test^='']").length&&i.push("[*^$]="+O+"*(?:\"\"|'')"),e.innerHTML="",e.querySelectorAll(":enabled").length||i.push(":enabled",":disabled")}),i=new RegExp(i.join("|")),vt=function(e,r,s,o,u){if(!o&&!u&&!i.test(e)){var a,f,l=!0,c=d,h=r,p=r.nodeType===9&&e;if(r.nodeType===1&&r.nodeName.toLowerCase()!=="object"){a=ut(e),(l=r.getAttribute("id"))?c=l.replace(n,"\\$&"):r.setAttribute("id",c),c="[id='"+c+"'] ",f=a.length;while(f--)a[f]=c+a[f].join("");h=z.test(e)&&r.parentNode||r,p=a.join(",")}if(p)try{return S.apply(s,x.call(h.querySelectorAll(p),0)),s}catch(v){}finally{l||r.removeAttribute("id")}}return t(e,r,s,o,u)},u&&(K(function(t){e=u.call(t,"div");try{u.call(t,"[test!='']:sizzle"),s.push("!=",H)}catch(n){}}),s=new RegExp(s.join("|")),nt.matchesSelector=function(t,n){n=n.replace(r,"='$1']");if(!o(t)&&!s.test(n)&&!i.test(n))try{var a=u.call(t,n);if(a||e||t.document&&t.document.nodeType!==11)return a}catch(f){}return nt(n,null,null,[t]).length>0})}(),i.pseudos.nth=i.pseudos.eq,i.filters=mt.prototype=i.pseudos,i.setFilters=new mt,nt.attr=v.attr,v.find=nt,v.expr=nt.selectors,v.expr[":"]=v.expr.pseudos,v.unique=nt.uniqueSort,v.text=nt.getText,v.isXMLDoc=nt.isXML,v.contains=nt.contains}(e);var nt=/Until$/,rt=/^(?:parents|prev(?:Until|All))/,it=/^.[^:#\[\.,]*$/,st=v.expr.match.needsContext,ot={children:!0,contents:!0,next:!0,prev:!0};v.fn.extend({find:function(e){var t,n,r,i,s,o,u=this;if(typeof e!="string")return v(e).filter(function(){for(t=0,n=u.length;t0)for(i=r;i=0:v.filter(e,this).length>0:this.filter(e).length>0)},closest:function(e,t){var n,r=0,i=this.length,s=[],o=st.test(e)||typeof e!="string"?v(e,t||this.context):0;for(;r-1:v.find.matchesSelector(n,e)){s.push(n);break}n=n.parentNode}}return s=s.length>1?v.unique(s):s,this.pushStack(s,"closest",e)},index:function(e){return e?typeof e=="string"?v.inArray(this[0],v(e)):v.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(e,t){var n=typeof e=="string"?v(e,t):v.makeArray(e&&e.nodeType?[e]:e),r=v.merge(this.get(),n);return this.pushStack(ut(n[0])||ut(r[0])?r:v.unique(r))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),v.fn.andSelf=v.fn.addBack,v.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return v.dir(e,"parentNode")},parentsUntil:function(e,t,n){return v.dir(e,"parentNode",n)},next:function(e){return at(e,"nextSibling")},prev:function(e){return at(e,"previousSibling")},nextAll:function(e){return v.dir(e,"nextSibling")},prevAll:function(e){return v.dir(e,"previousSibling")},nextUntil:function(e,t,n){return v.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return v.dir(e,"previousSibling",n)},siblings:function(e){return v.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return v.sibling(e.firstChild)},contents:function(e){return v.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:v.merge([],e.childNodes)}},function(e,t){v.fn[e]=function(n,r){var i=v.map(this,t,n);return nt.test(e)||(r=n),r&&typeof r=="string"&&(i=v.filter(r,i)),i=this.length>1&&!ot[e]?v.unique(i):i,this.length>1&&rt.test(e)&&(i=i.reverse()),this.pushStack(i,e,l.call(arguments).join(","))}}),v.extend({filter:function(e,t,n){return n&&(e=":not("+e+")"),t.length===1?v.find.matchesSelector(t[0],e)?[t[0]]:[]:v.find.matches(e,t)},dir:function(e,n,r){var i=[],s=e[n];while(s&&s.nodeType!==9&&(r===t||s.nodeType!==1||!v(s).is(r)))s.nodeType===1&&i.push(s),s=s[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}});var ct="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ht=/ jQuery\d+="(?:null|\d+)"/g,pt=/^\s+/,dt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,vt=/<([\w:]+)/,mt=/]","i"),Et=/^(?:checkbox|radio)$/,St=/checked\s*(?:[^=]|=\s*.checked.)/i,xt=/\/(java|ecma)script/i,Tt=/^\s*\s*$/g,Nt={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]},Ct=lt(i),kt=Ct.appendChild(i.createElement("div"));Nt.optgroup=Nt.option,Nt.tbody=Nt.tfoot=Nt.colgroup=Nt.caption=Nt.thead,Nt.th=Nt.td,v.support.htmlSerialize||(Nt._default=[1,"X
","
"]),v.fn.extend({text:function(e){return v.access(this,function(e){return e===t?v.text(this):this.empty().append((this[0]&&this[0].ownerDocument||i).createTextNode(e))},null,e,arguments.length)},wrapAll:function(e){if(v.isFunction(e))return this.each(function(t){v(this).wrapAll(e.call(this,t))});if(this[0]){var t=v(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return v.isFunction(e)?this.each(function(t){v(this).wrapInner(e.call(this,t))}):this.each(function(){var t=v(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=v.isFunction(e);return this.each(function(n){v(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){v.nodeName(this,"body")||v(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.appendChild(e)})},prepend:function(){return this.domManip(arguments,!0,function(e){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(e,this.firstChild)})},before:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(e,this),"before",this.selector)}},after:function(){if(!ut(this[0]))return this.domManip(arguments,!1,function(e){this.parentNode.insertBefore(e,this.nextSibling)});if(arguments.length){var e=v.clean(arguments);return this.pushStack(v.merge(this,e),"after",this.selector)}},remove:function(e,t){var n,r=0;for(;(n=this[r])!=null;r++)if(!e||v.filter(e,[n]).length)!t&&n.nodeType===1&&(v.cleanData(n.getElementsByTagName("*")),v.cleanData([n])),n.parentNode&&n.parentNode.removeChild(n);return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&v.cleanData(e.getElementsByTagName("*"));while(e.firstChild)e.removeChild(e.firstChild)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return v.clone(this,e,t)})},html:function(e){return v.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return n.nodeType===1?n.innerHTML.replace(ht,""):t;if(typeof e=="string"&&!yt.test(e)&&(v.support.htmlSerialize||!wt.test(e))&&(v.support.leadingWhitespace||!pt.test(e))&&!Nt[(vt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(dt,"<$1>");try{for(;r1&&typeof f=="string"&&St.test(f))return this.each(function(){v(this).domManip(e,n,r)});if(v.isFunction(f))return this.each(function(i){var s=v(this);e[0]=f.call(this,i,n?s.html():t),s.domManip(e,n,r)});if(this[0]){i=v.buildFragment(e,this,l),o=i.fragment,s=o.firstChild,o.childNodes.length===1&&(o=s);if(s){n=n&&v.nodeName(s,"tr");for(u=i.cacheable||c-1;a0?this.clone(!0):this).get(),v(o[i])[t](r),s=s.concat(r);return this.pushStack(s,e,o.selector)}}),v.extend({clone:function(e,t,n){var r,i,s,o;v.support.html5Clone||v.isXMLDoc(e)||!wt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(kt.innerHTML=e.outerHTML,kt.removeChild(o=kt.firstChild));if((!v.support.noCloneEvent||!v.support.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!v.isXMLDoc(e)){Ot(e,o),r=Mt(e),i=Mt(o);for(s=0;r[s];++s)i[s]&&Ot(r[s],i[s])}if(t){At(e,o);if(n){r=Mt(e),i=Mt(o);for(s=0;r[s];++s)At(r[s],i[s])}}return r=i=null,o},clean:function(e,t,n,r){var s,o,u,a,f,l,c,h,p,d,m,g,y=t===i&&Ct,b=[];if(!t||typeof t.createDocumentFragment=="undefined")t=i;for(s=0;(u=e[s])!=null;s++){typeof u=="number"&&(u+="");if(!u)continue;if(typeof u=="string")if(!gt.test(u))u=t.createTextNode(u);else{y=y||lt(t),c=t.createElement("div"),y.appendChild(c),u=u.replace(dt,"<$1>"),a=(vt.exec(u)||["",""])[1].toLowerCase(),f=Nt[a]||Nt._default,l=f[0],c.innerHTML=f[1]+u+f[2];while(l--)c=c.lastChild;if(!v.support.tbody){h=mt.test(u),p=a==="table"&&!h?c.firstChild&&c.firstChild.childNodes:f[1]===""&&!h?c.childNodes:[];for(o=p.length-1;o>=0;--o)v.nodeName(p[o],"tbody")&&!p[o].childNodes.length&&p[o].parentNode.removeChild(p[o])}!v.support.leadingWhitespace&&pt.test(u)&&c.insertBefore(t.createTextNode(pt.exec(u)[0]),c.firstChild),u=c.childNodes,c.parentNode.removeChild(c)}u.nodeType?b.push(u):v.merge(b,u)}c&&(u=c=y=null);if(!v.support.appendChecked)for(s=0;(u=b[s])!=null;s++)v.nodeName(u,"input")?_t(u):typeof u.getElementsByTagName!="undefined"&&v.grep(u.getElementsByTagName("input"),_t);if(n){m=function(e){if(!e.type||xt.test(e.type))return r?r.push(e.parentNode?e.parentNode.removeChild(e):e):n.appendChild(e)};for(s=0;(u=b[s])!=null;s++)if(!v.nodeName(u,"script")||!m(u))n.appendChild(u),typeof u.getElementsByTagName!="undefined"&&(g=v.grep(v.merge([],u.getElementsByTagName("script")),m),b.splice.apply(b,[s+1,0].concat(g)),s+=g.length)}return b},cleanData:function(e,t){var n,r,i,s,o=0,u=v.expando,a=v.cache,f=v.support.deleteExpando,l=v.event.special;for(;(i=e[o])!=null;o++)if(t||v.acceptData(i)){r=i[u],n=r&&a[r];if(n){if(n.events)for(s in n.events)l[s]?v.event.remove(i,s):v.removeEvent(i,s,n.handle);a[r]&&(delete a[r],f?delete i[u]:i.removeAttribute?i.removeAttribute(u):i[u]=null,v.deletedIds.push(r))}}}}),function(){var e,t;v.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e=v.uaMatch(o.userAgent),t={},e.browser&&(t[e.browser]=!0,t.version=e.version),t.chrome?t.webkit=!0:t.webkit&&(t.safari=!0),v.browser=t,v.sub=function(){function e(t,n){return new e.fn.init(t,n)}v.extend(!0,e,this),e.superclass=this,e.fn=e.prototype=this(),e.fn.constructor=e,e.sub=this.sub,e.fn.init=function(r,i){return i&&i instanceof v&&!(i instanceof e)&&(i=e(i)),v.fn.init.call(this,r,i,t)},e.fn.init.prototype=e.fn;var t=e(i);return e}}();var Dt,Pt,Ht,Bt=/alpha\([^)]*\)/i,jt=/opacity=([^)]*)/,Ft=/^(top|right|bottom|left)$/,It=/^(none|table(?!-c[ea]).+)/,qt=/^margin/,Rt=new RegExp("^("+m+")(.*)$","i"),Ut=new RegExp("^("+m+")(?!px)[a-z%]+$","i"),zt=new RegExp("^([-+])=("+m+")","i"),Wt={BODY:"block"},Xt={position:"absolute",visibility:"hidden",display:"block"},Vt={letterSpacing:0,fontWeight:400},$t=["Top","Right","Bottom","Left"],Jt=["Webkit","O","Moz","ms"],Kt=v.fn.toggle;v.fn.extend({css:function(e,n){return v.access(this,function(e,n,r){return r!==t?v.style(e,n,r):v.css(e,n)},e,n,arguments.length>1)},show:function(){return Yt(this,!0)},hide:function(){return Yt(this)},toggle:function(e,t){var n=typeof e=="boolean";return v.isFunction(e)&&v.isFunction(t)?Kt.apply(this,arguments):this.each(function(){(n?e:Gt(this))?v(this).show():v(this).hide()})}}),v.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Dt(e,"opacity");return n===""?"1":n}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":v.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var s,o,u,a=v.camelCase(n),f=e.style;n=v.cssProps[a]||(v.cssProps[a]=Qt(f,a)),u=v.cssHooks[n]||v.cssHooks[a];if(r===t)return u&&"get"in u&&(s=u.get(e,!1,i))!==t?s:f[n];o=typeof r,o==="string"&&(s=zt.exec(r))&&(r=(s[1]+1)*s[2]+parseFloat(v.css(e,n)),o="number");if(r==null||o==="number"&&isNaN(r))return;o==="number"&&!v.cssNumber[a]&&(r+="px");if(!u||!("set"in u)||(r=u.set(e,r,i))!==t)try{f[n]=r}catch(l){}},css:function(e,n,r,i){var s,o,u,a=v.camelCase(n);return n=v.cssProps[a]||(v.cssProps[a]=Qt(e.style,a)),u=v.cssHooks[n]||v.cssHooks[a],u&&"get"in u&&(s=u.get(e,!0,i)),s===t&&(s=Dt(e,n)),s==="normal"&&n in Vt&&(s=Vt[n]),r||i!==t?(o=parseFloat(s),r||v.isNumeric(o)?o||0:s):s},swap:function(e,t,n){var r,i,s={};for(i in t)s[i]=e.style[i],e.style[i]=t[i];r=n.call(e);for(i in t)e.style[i]=s[i];return r}}),e.getComputedStyle?Dt=function(t,n){var r,i,s,o,u=e.getComputedStyle(t,null),a=t.style;return u&&(r=u.getPropertyValue(n)||u[n],r===""&&!v.contains(t.ownerDocument,t)&&(r=v.style(t,n)),Ut.test(r)&&qt.test(n)&&(i=a.width,s=a.minWidth,o=a.maxWidth,a.minWidth=a.maxWidth=a.width=r,r=u.width,a.width=i,a.minWidth=s,a.maxWidth=o)),r}:i.documentElement.currentStyle&&(Dt=function(e,t){var n,r,i=e.currentStyle&&e.currentStyle[t],s=e.style;return i==null&&s&&s[t]&&(i=s[t]),Ut.test(i)&&!Ft.test(t)&&(n=s.left,r=e.runtimeStyle&&e.runtimeStyle.left,r&&(e.runtimeStyle.left=e.currentStyle.left),s.left=t==="fontSize"?"1em":i,i=s.pixelLeft+"px",s.left=n,r&&(e.runtimeStyle.left=r)),i===""?"auto":i}),v.each(["height","width"],function(e,t){v.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&It.test(Dt(e,"display"))?v.swap(e,Xt,function(){return tn(e,t,r)}):tn(e,t,r)},set:function(e,n,r){return Zt(e,n,r?en(e,t,r,v.support.boxSizing&&v.css(e,"boxSizing")==="border-box"):0)}}}),v.support.opacity||(v.cssHooks.opacity={get:function(e,t){return jt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=v.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if(t>=1&&v.trim(s.replace(Bt,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(r&&!r.filter)return}n.filter=Bt.test(s)?s.replace(Bt,i):s+" "+i}}),v(function(){v.support.reliableMarginRight||(v.cssHooks.marginRight={get:function(e,t){return v.swap(e,{display:"inline-block"},function(){if(t)return Dt(e,"marginRight")})}}),!v.support.pixelPosition&&v.fn.position&&v.each(["top","left"],function(e,t){v.cssHooks[t]={get:function(e,n){if(n){var r=Dt(e,t);return Ut.test(r)?v(e).position()[t]+"px":r}}}})}),v.expr&&v.expr.filters&&(v.expr.filters.hidden=function(e){return e.offsetWidth===0&&e.offsetHeight===0||!v.support.reliableHiddenOffsets&&(e.style&&e.style.display||Dt(e,"display"))==="none"},v.expr.filters.visible=function(e){return!v.expr.filters.hidden(e)}),v.each({margin:"",padding:"",border:"Width"},function(e,t){v.cssHooks[e+t]={expand:function(n){var r,i=typeof n=="string"?n.split(" "):[n],s={};for(r=0;r<4;r++)s[e+$t[r]+t]=i[r]||i[r-2]||i[0];return s}},qt.test(e)||(v.cssHooks[e+t].set=Zt)});var rn=/%20/g,sn=/\[\]$/,on=/\r?\n/g,un=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,an=/^(?:select|textarea)/i;v.fn.extend({serialize:function(){return v.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?v.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||an.test(this.nodeName)||un.test(this.type))}).map(function(e,t){var n=v(this).val();return n==null?null:v.isArray(n)?v.map(n,function(e,n){return{name:t.name,value:e.replace(on,"\r\n")}}):{name:t.name,value:n.replace(on,"\r\n")}}).get()}}),v.param=function(e,n){var r,i=[],s=function(e,t){t=v.isFunction(t)?t():t==null?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};n===t&&(n=v.ajaxSettings&&v.ajaxSettings.traditional);if(v.isArray(e)||e.jquery&&!v.isPlainObject(e))v.each(e,function(){s(this.name,this.value)});else for(r in e)fn(r,e[r],n,s);return i.join("&").replace(rn,"+")};var ln,cn,hn=/#.*$/,pn=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,dn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,vn=/^(?:GET|HEAD)$/,mn=/^\/\//,gn=/\?/,yn=/)<[^<]*)*<\/script>/gi,bn=/([?&])_=[^&]*/,wn=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,En=v.fn.load,Sn={},xn={},Tn=["*/"]+["*"];try{cn=s.href}catch(Nn){cn=i.createElement("a"),cn.href="",cn=cn.href}ln=wn.exec(cn.toLowerCase())||[],v.fn.load=function(e,n,r){if(typeof e!="string"&&En)return En.apply(this,arguments);if(!this.length)return this;var i,s,o,u=this,a=e.indexOf(" ");return a>=0&&(i=e.slice(a,e.length),e=e.slice(0,a)),v.isFunction(n)?(r=n,n=t):n&&typeof n=="object"&&(s="POST"),v.ajax({url:e,type:s,dataType:"html",data:n,complete:function(e,t){r&&u.each(r,o||[e.responseText,t,e])}}).done(function(e){o=arguments,u.html(i?v("
").append(e.replace(yn,"")).find(i):e)}),this},v.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(e,t){v.fn[t]=function(e){return this.on(t,e)}}),v.each(["get","post"],function(e,n){v[n]=function(e,r,i,s){return v.isFunction(r)&&(s=s||i,i=r,r=t),v.ajax({type:n,url:e,data:r,success:i,dataType:s})}}),v.extend({getScript:function(e,n){return v.get(e,t,n,"script")},getJSON:function(e,t,n){return v.get(e,t,n,"json")},ajaxSetup:function(e,t){return t?Ln(e,v.ajaxSettings):(t=e,e=v.ajaxSettings),Ln(e,t),e},ajaxSettings:{url:cn,isLocal:dn.test(ln[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":Tn},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":e.String,"text html":!0,"text json":v.parseJSON,"text xml":v.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:Cn(Sn),ajaxTransport:Cn(xn),ajax:function(e,n){function T(e,n,s,a){var l,y,b,w,S,T=n;if(E===2)return;E=2,u&&clearTimeout(u),o=t,i=a||"",x.readyState=e>0?4:0,s&&(w=An(c,x,s));if(e>=200&&e<300||e===304)c.ifModified&&(S=x.getResponseHeader("Last-Modified"),S&&(v.lastModified[r]=S),S=x.getResponseHeader("Etag"),S&&(v.etag[r]=S)),e===304?(T="notmodified",l=!0):(l=On(c,w),T=l.state,y=l.data,b=l.error,l=!b);else{b=T;if(!T||e)T="error",e<0&&(e=0)}x.status=e,x.statusText=(n||T)+"",l?d.resolveWith(h,[y,T,x]):d.rejectWith(h,[x,T,b]),x.statusCode(g),g=t,f&&p.trigger("ajax"+(l?"Success":"Error"),[x,c,l?y:b]),m.fireWith(h,[x,T]),f&&(p.trigger("ajaxComplete",[x,c]),--v.active||v.event.trigger("ajaxStop"))}typeof e=="object"&&(n=e,e=t),n=n||{};var r,i,s,o,u,a,f,l,c=v.ajaxSetup({},n),h=c.context||c,p=h!==c&&(h.nodeType||h instanceof v)?v(h):v.event,d=v.Deferred(),m=v.Callbacks("once memory"),g=c.statusCode||{},b={},w={},E=0,S="canceled",x={readyState:0,setRequestHeader:function(e,t){if(!E){var n=e.toLowerCase();e=w[n]=w[n]||e,b[e]=t}return this},getAllResponseHeaders:function(){return E===2?i:null},getResponseHeader:function(e){var n;if(E===2){if(!s){s={};while(n=pn.exec(i))s[n[1].toLowerCase()]=n[2]}n=s[e.toLowerCase()]}return n===t?null:n},overrideMimeType:function(e){return E||(c.mimeType=e),this},abort:function(e){return e=e||S,o&&o.abort(e),T(0,e),this}};d.promise(x),x.success=x.done,x.error=x.fail,x.complete=m.add,x.statusCode=function(e){if(e){var t;if(E<2)for(t in e)g[t]=[g[t],e[t]];else t=e[x.status],x.always(t)}return this},c.url=((e||c.url)+"").replace(hn,"").replace(mn,ln[1]+"//"),c.dataTypes=v.trim(c.dataType||"*").toLowerCase().split(y),c.crossDomain==null&&(a=wn.exec(c.url.toLowerCase()),c.crossDomain=!(!a||a[1]===ln[1]&&a[2]===ln[2]&&(a[3]||(a[1]==="http:"?80:443))==(ln[3]||(ln[1]==="http:"?80:443)))),c.data&&c.processData&&typeof c.data!="string"&&(c.data=v.param(c.data,c.traditional)),kn(Sn,c,n,x);if(E===2)return x;f=c.global,c.type=c.type.toUpperCase(),c.hasContent=!vn.test(c.type),f&&v.active++===0&&v.event.trigger("ajaxStart");if(!c.hasContent){c.data&&(c.url+=(gn.test(c.url)?"&":"?")+c.data,delete c.data),r=c.url;if(c.cache===!1){var N=v.now(),C=c.url.replace(bn,"$1_="+N);c.url=C+(C===c.url?(gn.test(c.url)?"&":"?")+"_="+N:"")}}(c.data&&c.hasContent&&c.contentType!==!1||n.contentType)&&x.setRequestHeader("Content-Type",c.contentType),c.ifModified&&(r=r||c.url,v.lastModified[r]&&x.setRequestHeader("If-Modified-Since",v.lastModified[r]),v.etag[r]&&x.setRequestHeader("If-None-Match",v.etag[r])),x.setRequestHeader("Accept",c.dataTypes[0]&&c.accepts[c.dataTypes[0]]?c.accepts[c.dataTypes[0]]+(c.dataTypes[0]!=="*"?", "+Tn+"; q=0.01":""):c.accepts["*"]);for(l in c.headers)x.setRequestHeader(l,c.headers[l]);if(!c.beforeSend||c.beforeSend.call(h,x,c)!==!1&&E!==2){S="abort";for(l in{success:1,error:1,complete:1})x[l](c[l]);o=kn(xn,c,n,x);if(!o)T(-1,"No Transport");else{x.readyState=1,f&&p.trigger("ajaxSend",[x,c]),c.async&&c.timeout>0&&(u=setTimeout(function(){x.abort("timeout")},c.timeout));try{E=1,o.send(b,T)}catch(k){if(!(E<2))throw k;T(-1,k)}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var Mn=[],_n=/\?/,Dn=/(=)\?(?=&|$)|\?\?/,Pn=v.now();v.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Mn.pop()||v.expando+"_"+Pn++;return this[e]=!0,e}}),v.ajaxPrefilter("json jsonp",function(n,r,i){var s,o,u,a=n.data,f=n.url,l=n.jsonp!==!1,c=l&&Dn.test(f),h=l&&!c&&typeof a=="string"&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Dn.test(a);if(n.dataTypes[0]==="jsonp"||c||h)return s=n.jsonpCallback=v.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,o=e[s],c?n.url=f.replace(Dn,"$1"+s):h?n.data=a.replace(Dn,"$1"+s):l&&(n.url+=(_n.test(f)?"&":"?")+n.jsonp+"="+s),n.converters["script json"]=function(){return u||v.error(s+" was not called"),u[0]},n.dataTypes[0]="json",e[s]=function(){u=arguments},i.always(function(){e[s]=o,n[s]&&(n.jsonpCallback=r.jsonpCallback,Mn.push(s)),u&&v.isFunction(o)&&o(u[0]),u=o=t}),"script"}),v.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(e){return v.globalEval(e),e}}}),v.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),v.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=i.head||i.getElementsByTagName("head")[0]||i.documentElement;return{send:function(s,o){n=i.createElement("script"),n.async="async",e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,i){if(i||!n.readyState||/loaded|complete/.test(n.readyState))n.onload=n.onreadystatechange=null,r&&n.parentNode&&r.removeChild(n),n=t,i||o(200,"success")},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(0,1)}}}});var Hn,Bn=e.ActiveXObject?function(){for(var e in Hn)Hn[e](0,1)}:!1,jn=0;v.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&Fn()||In()}:Fn,function(e){v.extend(v.support,{ajax:!!e,cors:!!e&&"withCredentials"in e})}(v.ajaxSettings.xhr()),v.support.ajax&&v.ajaxTransport(function(n){if(!n.crossDomain||v.support.cors){var r;return{send:function(i,s){var o,u,a=n.xhr();n.username?a.open(n.type,n.url,n.async,n.username,n.password):a.open(n.type,n.url,n.async);if(n.xhrFields)for(u in n.xhrFields)a[u]=n.xhrFields[u];n.mimeType&&a.overrideMimeType&&a.overrideMimeType(n.mimeType),!n.crossDomain&&!i["X-Requested-With"]&&(i["X-Requested-With"]="XMLHttpRequest");try{for(u in i)a.setRequestHeader(u,i[u])}catch(f){}a.send(n.hasContent&&n.data||null),r=function(e,i){var u,f,l,c,h;try{if(r&&(i||a.readyState===4)){r=t,o&&(a.onreadystatechange=v.noop,Bn&&delete Hn[o]);if(i)a.readyState!==4&&a.abort();else{u=a.status,l=a.getAllResponseHeaders(),c={},h=a.responseXML,h&&h.documentElement&&(c.xml=h);try{c.text=a.responseText}catch(p){}try{f=a.statusText}catch(p){f=""}!u&&n.isLocal&&!n.crossDomain?u=c.text?200:404:u===1223&&(u=204)}}}catch(d){i||s(-1,d)}c&&s(u,f,c,l)},n.async?a.readyState===4?setTimeout(r,0):(o=++jn,Bn&&(Hn||(Hn={},v(e).unload(Bn)),Hn[o]=r),a.onreadystatechange=r):r()},abort:function(){r&&r(0,1)}}}});var qn,Rn,Un=/^(?:toggle|show|hide)$/,zn=new RegExp("^(?:([-+])=|)("+m+")([a-z%]*)$","i"),Wn=/queueHooks$/,Xn=[Gn],Vn={"*":[function(e,t){var n,r,i=this.createTween(e,t),s=zn.exec(t),o=i.cur(),u=+o||0,a=1,f=20;if(s){n=+s[2],r=s[3]||(v.cssNumber[e]?"":"px");if(r!=="px"&&u){u=v.css(i.elem,e,!0)||n||1;do a=a||".5",u/=a,v.style(i.elem,e,u+r);while(a!==(a=i.cur()/o)&&a!==1&&--f)}i.unit=r,i.start=u,i.end=s[1]?u+(s[1]+1)*n:n}return i}]};v.Animation=v.extend(Kn,{tweener:function(e,t){v.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r-1,f={},l={},c,h;a?(l=i.position(),c=l.top,h=l.left):(c=parseFloat(o)||0,h=parseFloat(u)||0),v.isFunction(t)&&(t=t.call(e,n,s)),t.top!=null&&(f.top=t.top-s.top+c),t.left!=null&&(f.left=t.left-s.left+h),"using"in t?t.using.call(e,f):i.css(f)}},v.fn.extend({position:function(){if(!this[0])return;var e=this[0],t=this.offsetParent(),n=this.offset(),r=er.test(t[0].nodeName)?{top:0,left:0}:t.offset();return n.top-=parseFloat(v.css(e,"marginTop"))||0,n.left-=parseFloat(v.css(e,"marginLeft"))||0,r.top+=parseFloat(v.css(t[0],"borderTopWidth"))||0,r.left+=parseFloat(v.css(t[0],"borderLeftWidth"))||0,{top:n.top-r.top,left:n.left-r.left}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||i.body;while(e&&!er.test(e.nodeName)&&v.css(e,"position")==="static")e=e.offsetParent;return e||i.body})}}),v.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);v.fn[e]=function(i){return v.access(this,function(e,i,s){var o=tr(e);if(s===t)return o?n in o?o[n]:o.document.documentElement[i]:e[i];o?o.scrollTo(r?v(o).scrollLeft():s,r?s:v(o).scrollTop()):e[i]=s},e,i,arguments.length,null)}}),v.each({Height:"height",Width:"width"},function(e,n){v.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){v.fn[i]=function(i,s){var o=arguments.length&&(r||typeof i!="boolean"),u=r||(i===!0||s===!0?"margin":"border");return v.access(this,function(n,r,i){var s;return v.isWindow(n)?n.document.documentElement["client"+e]:n.nodeType===9?(s=n.documentElement,Math.max(n.body["scroll"+e],s["scroll"+e],n.body["offset"+e],s["offset"+e],s["client"+e])):i===t?v.css(n,r,i,u):v.style(n,r,i,u)},n,o?i:t,o,null)}})}),e.jQuery=e.$=v,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return v})})(window); \ No newline at end of file diff --git a/docs/build/html/_static/minus.png b/docs/build/html/_static/minus.png deleted file mode 100644 index da1c5620d10c047525a467a425abe9ff5269cfc2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s1SHkYJtzcHoCO|{#XvD(5N2eUHAey{$X?>< z>&kweokM_|(Po{+Q=kw>iEBiObAE1aYF-J$w=>iB1I2R$WLpMkF=>bh=@O1TaS?83{1OVknK< z>&kweokM`jkU7Va11Q8%;u=xnoS&PUnpeW`?aZ|OK(QcC7sn8Z%gHvy&v=;Q4jejg zV8NnAO`-4Z@2~&zopr02WF_WB>pF diff --git a/docs/build/html/_static/pygments.css b/docs/build/html/_static/pygments.css deleted file mode 100644 index d79caa15..00000000 --- a/docs/build/html/_static/pygments.css +++ /dev/null @@ -1,62 +0,0 @@ -.highlight .hll { background-color: #ffffcc } -.highlight { background: #eeffcc; } -.highlight .c { color: #408090; font-style: italic } /* Comment */ -.highlight .err { border: 1px solid #FF0000 } /* Error */ -.highlight .k { color: #007020; font-weight: bold } /* Keyword */ -.highlight .o { color: #666666 } /* Operator */ -.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #007020 } /* Comment.Preproc */ -.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */ -.highlight .gd { color: #A00000 } /* Generic.Deleted */ -.highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #FF0000 } /* Generic.Error */ -.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.highlight .gi { color: #00A000 } /* Generic.Inserted */ -.highlight .go { color: #333333 } /* Generic.Output */ -.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */ -.highlight .gs { font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.highlight .gt { color: #0044DD } /* Generic.Traceback */ -.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */ -.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */ -.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */ -.highlight .kp { color: #007020 } /* Keyword.Pseudo */ -.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */ -.highlight .kt { color: #902000 } /* Keyword.Type */ -.highlight .m { color: #208050 } /* Literal.Number */ -.highlight .s { color: #4070a0 } /* Literal.String */ -.highlight .na { color: #4070a0 } /* Name.Attribute */ -.highlight .nb { color: #007020 } /* Name.Builtin */ -.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */ -.highlight .no { color: #60add5 } /* Name.Constant */ -.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */ -.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */ -.highlight .ne { color: #007020 } /* Name.Exception */ -.highlight .nf { color: #06287e } /* Name.Function */ -.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */ -.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */ -.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */ -.highlight .nv { color: #bb60d5 } /* Name.Variable */ -.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */ -.highlight .w { color: #bbbbbb } /* Text.Whitespace */ -.highlight .mf { color: #208050 } /* Literal.Number.Float */ -.highlight .mh { color: #208050 } /* Literal.Number.Hex */ -.highlight .mi { color: #208050 } /* Literal.Number.Integer */ -.highlight .mo { color: #208050 } /* Literal.Number.Oct */ -.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */ -.highlight .sc { color: #4070a0 } /* Literal.String.Char */ -.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */ -.highlight .s2 { color: #4070a0 } /* Literal.String.Double */ -.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */ -.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */ -.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */ -.highlight .sx { color: #c65d09 } /* Literal.String.Other */ -.highlight .sr { color: #235388 } /* Literal.String.Regex */ -.highlight .s1 { color: #4070a0 } /* Literal.String.Single */ -.highlight .ss { color: #517918 } /* Literal.String.Symbol */ -.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */ -.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */ -.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */ -.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */ \ No newline at end of file diff --git a/docs/build/html/_static/searchtools.js b/docs/build/html/_static/searchtools.js deleted file mode 100644 index 6e1f06bd..00000000 --- a/docs/build/html/_static/searchtools.js +++ /dev/null @@ -1,622 +0,0 @@ -/* - * searchtools.js_t - * ~~~~~~~~~~~~~~~~ - * - * Sphinx JavaScript utilties for the full-text search. - * - * :copyright: Copyright 2007-2014 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - - -/** - * Porter Stemmer - */ -var Stemmer = function() { - - var step2list = { - ational: 'ate', - tional: 'tion', - enci: 'ence', - anci: 'ance', - izer: 'ize', - bli: 'ble', - alli: 'al', - entli: 'ent', - eli: 'e', - ousli: 'ous', - ization: 'ize', - ation: 'ate', - ator: 'ate', - alism: 'al', - iveness: 'ive', - fulness: 'ful', - ousness: 'ous', - aliti: 'al', - iviti: 'ive', - biliti: 'ble', - logi: 'log' - }; - - var step3list = { - icate: 'ic', - ative: '', - alize: 'al', - iciti: 'ic', - ical: 'ic', - ful: '', - ness: '' - }; - - var c = "[^aeiou]"; // consonant - var v = "[aeiouy]"; // vowel - var C = c + "[^aeiouy]*"; // consonant sequence - var V = v + "[aeiou]*"; // vowel sequence - - var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0 - var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1 - var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1 - var s_v = "^(" + C + ")?" + v; // vowel in stem - - this.stemWord = function (w) { - var stem; - var suffix; - var firstch; - var origword = w; - - if (w.length < 3) - return w; - - var re; - var re2; - var re3; - var re4; - - firstch = w.substr(0,1); - if (firstch == "y") - w = firstch.toUpperCase() + w.substr(1); - - // Step 1a - re = /^(.+?)(ss|i)es$/; - re2 = /^(.+?)([^s])s$/; - - if (re.test(w)) - w = w.replace(re,"$1$2"); - else if (re2.test(w)) - w = w.replace(re2,"$1$2"); - - // Step 1b - re = /^(.+?)eed$/; - re2 = /^(.+?)(ed|ing)$/; - if (re.test(w)) { - var fp = re.exec(w); - re = new RegExp(mgr0); - if (re.test(fp[1])) { - re = /.$/; - w = w.replace(re,""); - } - } - else if (re2.test(w)) { - var fp = re2.exec(w); - stem = fp[1]; - re2 = new RegExp(s_v); - if (re2.test(stem)) { - w = stem; - re2 = /(at|bl|iz)$/; - re3 = new RegExp("([^aeiouylsz])\\1$"); - re4 = new RegExp("^" + C + v + "[^aeiouwxy]$"); - if (re2.test(w)) - w = w + "e"; - else if (re3.test(w)) { - re = /.$/; - w = w.replace(re,""); - } - else if (re4.test(w)) - w = w + "e"; - } - } - - // Step 1c - re = /^(.+?)y$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - re = new RegExp(s_v); - if (re.test(stem)) - w = stem + "i"; - } - - // Step 2 - re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - suffix = fp[2]; - re = new RegExp(mgr0); - if (re.test(stem)) - w = stem + step2list[suffix]; - } - - // Step 3 - re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - suffix = fp[2]; - re = new RegExp(mgr0); - if (re.test(stem)) - w = stem + step3list[suffix]; - } - - // Step 4 - re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/; - re2 = /^(.+?)(s|t)(ion)$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - re = new RegExp(mgr1); - if (re.test(stem)) - w = stem; - } - else if (re2.test(w)) { - var fp = re2.exec(w); - stem = fp[1] + fp[2]; - re2 = new RegExp(mgr1); - if (re2.test(stem)) - w = stem; - } - - // Step 5 - re = /^(.+?)e$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - re = new RegExp(mgr1); - re2 = new RegExp(meq1); - re3 = new RegExp("^" + C + v + "[^aeiouwxy]$"); - if (re.test(stem) || (re2.test(stem) && !(re3.test(stem)))) - w = stem; - } - re = /ll$/; - re2 = new RegExp(mgr1); - if (re.test(w) && re2.test(w)) { - re = /.$/; - w = w.replace(re,""); - } - - // and turn initial Y back to y - if (firstch == "y") - w = firstch.toLowerCase() + w.substr(1); - return w; - } -} - - - -/** - * Simple result scoring code. - */ -var Scorer = { - // Implement the following function to further tweak the score for each result - // The function takes a result array [filename, title, anchor, descr, score] - // and returns the new score. - /* - score: function(result) { - return result[4]; - }, - */ - - // query matches the full name of an object - objNameMatch: 11, - // or matches in the last dotted part of the object name - objPartialMatch: 6, - // Additive scores depending on the priority of the object - objPrio: {0: 15, // used to be importantResults - 1: 5, // used to be objectResults - 2: -5}, // used to be unimportantResults - // Used when the priority is not in the mapping. - objPrioDefault: 0, - - // query found in title - title: 15, - // query found in terms - term: 5 -}; - - -/** - * Search Module - */ -var Search = { - - _index : null, - _queued_query : null, - _pulse_status : -1, - - init : function() { - var params = $.getQueryParameters(); - if (params.q) { - var query = params.q[0]; - $('input[name="q"]')[0].value = query; - this.performSearch(query); - } - }, - - loadIndex : function(url) { - $.ajax({type: "GET", url: url, data: null, - dataType: "script", cache: true, - complete: function(jqxhr, textstatus) { - if (textstatus != "success") { - document.getElementById("searchindexloader").src = url; - } - }}); - }, - - setIndex : function(index) { - var q; - this._index = index; - if ((q = this._queued_query) !== null) { - this._queued_query = null; - Search.query(q); - } - }, - - hasIndex : function() { - return this._index !== null; - }, - - deferQuery : function(query) { - this._queued_query = query; - }, - - stopPulse : function() { - this._pulse_status = 0; - }, - - startPulse : function() { - if (this._pulse_status >= 0) - return; - function pulse() { - var i; - Search._pulse_status = (Search._pulse_status + 1) % 4; - var dotString = ''; - for (i = 0; i < Search._pulse_status; i++) - dotString += '.'; - Search.dots.text(dotString); - if (Search._pulse_status > -1) - window.setTimeout(pulse, 500); - } - pulse(); - }, - - /** - * perform a search for something (or wait until index is loaded) - */ - performSearch : function(query) { - // create the required interface elements - this.out = $('#search-results'); - this.title = $('

' + _('Searching') + '

').appendTo(this.out); - this.dots = $('').appendTo(this.title); - this.status = $('

').appendTo(this.out); - this.output = $('
'); - } - // Prettify the comment rating. - comment.pretty_rating = comment.rating + ' point' + - (comment.rating == 1 ? '' : 's'); - // Make a class (for displaying not yet moderated comments differently) - comment.css_class = comment.displayed ? '' : ' moderate'; - // Create a div for this comment. - var context = $.extend({}, opts, comment); - var div = $(renderTemplate(commentTemplate, context)); - - // If the user has voted on this comment, highlight the correct arrow. - if (comment.vote) { - var direction = (comment.vote == 1) ? 'u' : 'd'; - div.find('#' + direction + 'v' + comment.id).hide(); - div.find('#' + direction + 'u' + comment.id).show(); - } - - if (opts.moderator || comment.text != '[deleted]') { - div.find('a.reply').show(); - if (comment.proposal_diff) - div.find('#sp' + comment.id).show(); - if (opts.moderator && !comment.displayed) - div.find('#cm' + comment.id).show(); - if (opts.moderator || (opts.username == comment.username)) - div.find('#dc' + comment.id).show(); - } - return div; - } - - /** - * A simple template renderer. Placeholders such as <%id%> are replaced - * by context['id'] with items being escaped. Placeholders such as <#id#> - * are not escaped. - */ - function renderTemplate(template, context) { - var esc = $(document.createElement('div')); - - function handle(ph, escape) { - var cur = context; - $.each(ph.split('.'), function() { - cur = cur[this]; - }); - return escape ? esc.text(cur || "").html() : cur; - } - - return template.replace(/<([%#])([\w\.]*)\1>/g, function() { - return handle(arguments[2], arguments[1] == '%' ? true : false); - }); - } - - /** Flash an error message briefly. */ - function showError(message) { - $(document.createElement('div')).attr({'class': 'popup-error'}) - .append($(document.createElement('div')) - .attr({'class': 'error-message'}).text(message)) - .appendTo('body') - .fadeIn("slow") - .delay(2000) - .fadeOut("slow"); - } - - /** Add a link the user uses to open the comments popup. */ - $.fn.comment = function() { - return this.each(function() { - var id = $(this).attr('id').substring(1); - var count = COMMENT_METADATA[id]; - var title = count + ' comment' + (count == 1 ? '' : 's'); - var image = count > 0 ? opts.commentBrightImage : opts.commentImage; - var addcls = count == 0 ? ' nocomment' : ''; - $(this) - .append( - $(document.createElement('a')).attr({ - href: '#', - 'class': 'sphinx-comment-open' + addcls, - id: 'ao' + id - }) - .append($(document.createElement('img')).attr({ - src: image, - alt: 'comment', - title: title - })) - .click(function(event) { - event.preventDefault(); - show($(this).attr('id').substring(2)); - }) - ) - .append( - $(document.createElement('a')).attr({ - href: '#', - 'class': 'sphinx-comment-close hidden', - id: 'ah' + id - }) - .append($(document.createElement('img')).attr({ - src: opts.closeCommentImage, - alt: 'close', - title: 'close' - })) - .click(function(event) { - event.preventDefault(); - hide($(this).attr('id').substring(2)); - }) - ); - }); - }; - - var opts = { - processVoteURL: '/_process_vote', - addCommentURL: '/_add_comment', - getCommentsURL: '/_get_comments', - acceptCommentURL: '/_accept_comment', - deleteCommentURL: '/_delete_comment', - commentImage: '/static/_static/comment.png', - closeCommentImage: '/static/_static/comment-close.png', - loadingImage: '/static/_static/ajax-loader.gif', - commentBrightImage: '/static/_static/comment-bright.png', - upArrow: '/static/_static/up.png', - downArrow: '/static/_static/down.png', - upArrowPressed: '/static/_static/up-pressed.png', - downArrowPressed: '/static/_static/down-pressed.png', - voting: false, - moderator: false - }; - - if (typeof COMMENT_OPTIONS != "undefined") { - opts = jQuery.extend(opts, COMMENT_OPTIONS); - } - - var popupTemplate = '\ -
\ -

\ - Sort by:\ - best rated\ - newest\ - oldest\ -

\ -
Comments
\ -
\ - loading comments...
\ -
    \ -
    \ -

    Add a comment\ - (markup):

    \ -
    \ - reStructured text markup: *emph*, **strong**, \ - ``code``, \ - code blocks: :: and an indented block after blank line
    \ -
    \ - \ -

    \ - \ - Propose a change ▹\ - \ - \ - Propose a change ▿\ - \ -

    \ - \ - \ - \ - \ - \ -
    \ -
    '; - - var commentTemplate = '\ -
    \ -
    \ -
    \ - \ - \ - \ - \ - \ - \ -
    \ -
    \ - \ - \ - \ - \ - \ - \ -
    \ -
    \ -
    \ -

    \ - <%username%>\ - <%pretty_rating%>\ - <%time.delta%>\ -

    \ -
    <#text#>
    \ -

    \ - \ - reply ▿\ - proposal ▹\ - proposal ▿\ - \ - \ -

    \ - 
    \
-<#proposal_diff#>\
-
    \ -
      \ -
      \ -
      \ -
      \ - '; - - var replyTemplate = '\ -
    • \ -
      \ -
      \ - \ - \ - \ - \ - \ - \ -
      \ -
      • '; - - $(document).ready(function() { - init(); - }); -})(jQuery); - -$(document).ready(function() { - // add comment anchors for all paragraphs that are commentable - $('.sphinx-has-comment').comment(); - - // highlight search words in search results - $("div.context").each(function() { - var params = $.getQueryParameters(); - var terms = (params.q) ? params.q[0].split(/\s+/) : []; - var result = $(this); - $.each(terms, function() { - result.highlightText(this.toLowerCase(), 'highlighted'); - }); - }); - - // directly open comment window if requested - var anchor = document.location.hash; - if (anchor.substring(0, 9) == '#comment-') { - $('#ao' + anchor.substring(9)).click(); - document.location.hash = '#s' + anchor.substring(9); - } -}); diff --git a/docs/build/html/genindex.html b/docs/build/html/genindex.html deleted file mode 100644 index 2f3a278b..00000000 --- a/docs/build/html/genindex.html +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - Index — PubNub 3.7.6 documentation - - - - - - - - - - - -
      -

      Navigation

      - -
      - -
      -
      -
      -
      - - -

      Index

      - -
      - A - | D - | E - | G - | H - | P - | R - | S - | T - | U - -
      -

      A

      -
      - -
      - -
      audit() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      D

      - - -
      - -
      decrypt() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      E

      - - -
      - -
      encrypt() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      G

      - - -
      - -
      grant() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      H

      - - - -
      - -
      here_now() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -
      history() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      P

      - - - -
      - -
      presence() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      - -
      publish() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      - -
      Pubnub (class in Pubnub) -
      - -
      - -
      (module) -
      - -
      -
      - -
      PubnubTornado (class in Pubnub) -
      - - -
      PubnubTwisted (class in Pubnub) -
      - -
      - -

      R

      - - -
      - -
      revoke() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      S

      - - -
      - -
      subscribe() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      T

      - - -
      - -
      time() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - -

      U

      - - -
      - -
      unsubscribe() (Pubnub.Pubnub method) -
      - -
      - -
      (Pubnub.PubnubTornado method) -
      - - -
      (Pubnub.PubnubTwisted method) -
      - -
      -
      - - - - - - -
      -
      - - - - - -
      -
      -
      - -
      -

      Navigation

      - -
      -
      - © Copyright 2014, PubNub Inc.. - Created using Sphinx 1.2.2. -
      - - \ No newline at end of file diff --git a/docs/build/html/index.html b/docs/build/html/index.html deleted file mode 100644 index 5b29831f..00000000 --- a/docs/build/html/index.html +++ /dev/null @@ -1,1555 +0,0 @@ - - - - - - - - Welcome to PubNub’s documentation! — PubNub 3.7.6 documentation - - - - - - - - - - - -
      -

      Navigation

      - -
      - -
      -
      -
      -
      - -
      -

      Welcome to PubNub’s documentation!

      -
      -
        -
      -
      -
      -

      Pubnub

      -
      -
      -class Pubnub.Pubnub(publish_key, subscribe_key, secret_key=None, cipher_key=None, auth_key=None, ssl_on=False, origin='pubsub.pubnub.com', uuid=None, pooling=True, daemon=False, pres_uuid=None)
      -
      -
      -audit(channel=None, auth_key=None, callback=None, error=None)
      -

      Method for fetching permissions from pubnub servers.

      -

      This method provides a mechanism to reveal existing PubNub Access Manager attributes -for any combination of subscribe_key, channel and auth_key.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to return PAM -attributes optionally in combination with auth_key. -If channel is not specified, results for all channels -associated with subscribe_key are returned. -If auth_key is not specified, it is possible to return -results for a comma separated list of channels.
      -
      auth_key: (string) (optional)
      -
      Specifies the auth_key to return PAM attributes for. -If only a single channel is specified, it is possible to return -results for a comma separated list of auth_keys.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -
      -
      “channels”:{
      -
      -
      “my_channel”:{
      -
      “auths”:{“my_ro_authkey”:{“r”:1,”w”:0}, -“my_rw_authkey”:{“r”:0,”w”:1}, -“my_admin_authkey”:{“r”:1,”w”:1}
      -
      -

      }

      -
      -
      -

      }

      -
      -

      },

      -
      -

      }

      -
      -
      -

      Usage:

      -
      -
      pubnub.audit (‘my_channel’); # Sync Mode
      -
      - -
      -
      -decrypt(message)
      -

      Method for decrypting data.

      -

      This method takes ciphertext as input and returns decrypted data. -This need not be called directly as enncryption/decryption is -taken care of transparently by Pubnub class if cipher key is -provided at time of initializing pubnub object

      -
      -
      Args:
      -
      message: Message to be decrypted.
      -
      Returns:
      -
      Returns decrypted message if cipher key is set
      -
      -
      - -
      -
      -encrypt(message)
      -

      Method for encrypting data.

      -

      This method takes plaintext as input and returns encrypted data. -This need not be called directly as enncryption/decryption is -taken care of transparently by Pubnub class if cipher key is -provided at time of initializing pubnub object

      -
      -
      Args:
      -
      message: Message to be encrypted.
      -
      Returns:
      -
      Returns encrypted message if cipher key is set
      -
      -
      - -
      -
      -grant(channel=None, auth_key=False, read=True, write=True, ttl=5, callback=None, error=None)
      -

      Method for granting permissions.

      -

      This function establishes subscribe and/or write permissions for -PubNub Access Manager (PAM) by setting the read or write attribute -to true. A grant with read or write set to false (or not included) -will revoke any previous grants with read or write set to true.

      -
      -
      Permissions can be applied to any one of three levels:
      -
        -
      1. Application level privileges are based on subscribe_key applying to all associated channels.
        2. -
      2. Channel level privileges are based on a combination of subscribe_key and channel name.
        3. -
      3. User level privileges are based on the combination of subscribe_key, channel and auth_key.
        4. -
      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to grant permissions to. -If channel is not specified, the grant applies to all -channels associated with the subscribe_key. If auth_key -is not specified, it is possible to grant permissions to -multiple channels simultaneously by specifying the channels -as a comma separated list.
      -
      auth_key: (string) (optional)
      -
      Specifies auth_key to grant permissions to. -It is possible to specify multiple auth_keys as comma -separated list in combination with a single channel name. -If auth_key is provided as the special-case value “null” -(or included in a comma-separated list, eg. “null,null,abc”), -a new auth_key will be generated and returned for each “null” value.
      -
      read: (boolean) (default: True)
      -
      Read permissions are granted by setting to True. -Read permissions are removed by setting to False.
      -
      write: (boolean) (default: True)
      -
      Write permissions are granted by setting to true. -Write permissions are removed by setting to false.
      -
      ttl: (int) (default: 1440 i.e 24 hrs)
      -
      Time in minutes for which granted permissions are valid. -Max is 525600 , Min is 1. -Setting ttl to 0 will apply the grant indefinitely.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response: -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -

      “ttl”:5, -“auths”:{

      -
      -
      “my_ro_authkey”:{“r”:1,”w”:0}
      -

      }, -“subscribe_key”:”my_subkey”, -“level”:”user”, -“channel”:”my_channel”

      -
      -

      }

      -
      -

      }

      -
      -
      -
      - -
      -
      -here_now(channel, callback=None, error=None)
      -

      Get here now data.

      -

      You can obtain information about the current state of a channel including -a list of unique user-ids currently subscribed to the channel and the total -occupancy count of the channel by calling the here_now() function in your -application.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies the channel name to return occupancy results. -If channel is not provided, here_now will return data for all channels.
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      error: (optional)
      -
      Optional variable. An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Sync Mode: list -Async Mode: None

      -

      Response Format:

      -

      The here_now() method returns a list of uuid s currently subscribed to the channel.

      -

      uuids:[“String”,”String”, ... ,”String”] - List of UUIDs currently subscribed to the channel.

      -

      occupancy: Number - Total current occupancy of the channel.

      -

      Example Response: -{

      -
      -

      occupancy: 4, -uuids: [

      -
      -
      ‘123123234t234f34fq3dq’, -‘143r34f34t34fq34q34q3’, -‘23f34d3f4rq34r34rq23q’, -‘w34tcw45t45tcw435tww3’,
      -

      ]

      -
      -

      }

      -
      -
      -
      - -
      -
      -history(channel, count=100, reverse=False, start=None, end=None, callback=None, error=None)
      -

      This method fetches historical messages of a channel.

      -

      PubNub Storage/Playback Service provides real-time access to an unlimited -history for all messages published to PubNub. Stored messages are replicated -across multiple availability zones in several geographical data center -locations. Stored messages can be encrypted with AES-256 message encryption -ensuring that they are not readable while stored on PubNub’s network.

      -

      It is possible to control how messages are returned and in what order, -for example you can:

      -
      -

      Return messages in the order newest to oldest (default behavior).

      -

      Return messages in the order oldest to newest by setting reverse to true.

      -

      Page through results by providing a start or end time token.

      -

      Retrieve a “slice” of the time line by providing both a start and end time token.

      -

      Limit the number of messages to a specific quantity using the count parameter.

      -
      -
      -
      Args:
      -
      -
      channel: (string)
      -
      Specifies channel to return history messages from
      -
      count: (int) (default: 100)
      -
      Specifies the number of historical messages to return
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      error: (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a list in sync mode i.e. when callback argument is not given

      -
      -
      Sample Response:
      -
      [[“Pub1”,”Pub2”,”Pub3”,”Pub4”,”Pub5”],13406746729185766,13406746845892666]
      -
      -
      -
      -
      - -
      -
      -presence(channel, callback, error=None)
      -

      Subscribe to presence data on a channel.

      -
      -
      Only works in async mode
      -
      -
      Args:
      -

      channel: Channel name ( string ) on which to publish message -callback: A callback method should be passed to the method.

      -
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      error: Optional variable. An error method can be passed to the method.
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -
      None
      -
      -
      - -
      -
      -publish(channel, message, callback=None, error=None)
      -

      Publishes data on a channel.

      -

      The publish() method is used to send a message to all subscribers of a channel. -To publish a message you must first specify a valid publish_key at initialization. -A successfully published message is replicated across the PubNub Real-Time Network -and sent simultaneously to all subscribed clients on a channel.

      -
      -
      Messages in transit can be secured from potential eavesdroppers with SSL/TLS by
      -

      setting ssl to True during initialization.

      -

      Published messages can also be encrypted with AES-256 simply by specifying a cipher_key -during initialization.

      -
      -
      Args:
      -
      -
      channel: (string)
      -
      Specifies channel name to publish messages to.
      -
      message: (string/int/double/dict/list)
      -
      Message to be published
      -
      callback: (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      -
      -
      Returns:
      -

      Sync Mode : list -Async Mode : None

      -

      The function returns the following formatted response:

      -
      -
      [ Number, “Status”, “Time Token”]
      -

      The output below demonstrates the response to a successful call:

      -
      -
      [1,”Sent”,”13769558699541401”]
      -
      -
      -
      - -
      -
      -revoke(channel=None, auth_key=None, ttl=1, callback=None, error=None)
      -

      Method for revoking permissions.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to revoke permissions to. -If channel is not specified, the revoke applies to all -channels associated with the subscribe_key. If auth_key -is not specified, it is possible to grant permissions to -multiple channels simultaneously by specifying the channels -as a comma separated list.
      -
      auth_key: (string) (optional)
      -
      Specifies auth_key to revoke permissions to. -It is possible to specify multiple auth_keys as comma -separated list in combination with a single channel name. -If auth_key is provided as the special-case value “null” -(or included in a comma-separated list, eg. “null,null,abc”), -a new auth_key will be generated and returned for each “null” value.
      -
      ttl: (int) (default: 1440 i.e 24 hrs)
      -
      Time in minutes for which granted permissions are valid. -Max is 525600 , Min is 1. -Setting ttl to 0 will apply the grant indefinitely.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response: -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -

      “ttl”:5, -“auths”:{

      -
      -
      “my_authkey”:{“r”:0,”w”:0}
      -

      }, -“subscribe_key”:”my_subkey”, -“level”:”user”, -“channel”:”my_channel”

      -
      -

      }

      -
      -

      }

      -
      -
      -
      - -
      -
      -subscribe(channels, callback, error=None, connect=None, disconnect=None, reconnect=None, sync=False)
      -

      Subscribe to data on a channel.

      -

      This function causes the client to create an open TCP socket to the -PubNub Real-Time Network and begin listening for messages on a specified channel. -To subscribe to a channel the client must send the appropriate subscribe_key at -initialization.

      -

      Only works in async mode

      -
      -
      Args:
      -
      -
      channel: (string/list)
      -
      Specifies the channel to subscribe to. It is possible to specify -multiple channels as a comma separated list or andarray.
      -
      callback: (function)
      -
      This callback is called on receiving a message from the channel.
      -
      error: (function) (optional)
      -
      This callback is called on an error event
      -
      connect: (function) (optional)
      -
      This callback is called on a successful connection to the PubNub cloud
      -
      disconnect: (function) (optional)
      -
      This callback is called on client disconnect from the PubNub cloud
      -
      reconnect: (function) (optional)
      -
      This callback is called on successfully re-connecting to the PubNub cloud
      -
      -
      -
      Returns:
      -
      None
      -
      -
      - -
      -
      -time(callback=None)
      -

      This function will return a 17 digit precision Unix epoch.

      -

      Args:

      -
      -
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      -
      Returns:
      -

      Returns a 17 digit number in sync mode i.e. when callback argument is not given

      -
      -
      Sample:
      -
      13769501243685161
      -
      -
      -
      -
      - -
      -
      -unsubscribe(channel)
      -
      -
      Subscribe to presence data on a channel.
      -
      Only works in async mode
      -
      Args:
      -

      channel: Channel name ( string ) on which to publish message -message: Message to be published ( String / int / double / dict / list ). -callback: A callback method should be passed to the method.

      -
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      error: Optional variable. An error method can be passed to the method.
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -
      Returns a list in sync mode i.e. when callback argument is not given
      -
      -
      - -
      - -
      -
      -

      PubnubTwisted

      -
      -
      -class Pubnub.PubnubTwisted(publish_key, subscribe_key, secret_key=None, cipher_key=None, auth_key=None, ssl_on=False, origin='pubsub.pubnub.com')
      -
      -
      -audit(channel=None, auth_key=None, callback=None, error=None)
      -

      Method for fetching permissions from pubnub servers.

      -

      This method provides a mechanism to reveal existing PubNub Access Manager attributes -for any combination of subscribe_key, channel and auth_key.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to return PAM -attributes optionally in combination with auth_key. -If channel is not specified, results for all channels -associated with subscribe_key are returned. -If auth_key is not specified, it is possible to return -results for a comma separated list of channels.
      -
      auth_key: (string) (optional)
      -
      Specifies the auth_key to return PAM attributes for. -If only a single channel is specified, it is possible to return -results for a comma separated list of auth_keys.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -
      -
      “channels”:{
      -
      -
      “my_channel”:{
      -
      “auths”:{“my_ro_authkey”:{“r”:1,”w”:0}, -“my_rw_authkey”:{“r”:0,”w”:1}, -“my_admin_authkey”:{“r”:1,”w”:1}
      -
      -

      }

      -
      -
      -

      }

      -
      -

      },

      -
      -

      }

      -
      -
      -

      Usage:

      -
      -
      pubnub.audit (‘my_channel’); # Sync Mode
      -
      - -
      -
      -decrypt(message)
      -

      Method for decrypting data.

      -

      This method takes ciphertext as input and returns decrypted data. -This need not be called directly as enncryption/decryption is -taken care of transparently by Pubnub class if cipher key is -provided at time of initializing pubnub object

      -
      -
      Args:
      -
      message: Message to be decrypted.
      -
      Returns:
      -
      Returns decrypted message if cipher key is set
      -
      -
      - -
      -
      -encrypt(message)
      -

      Method for encrypting data.

      -

      This method takes plaintext as input and returns encrypted data. -This need not be called directly as enncryption/decryption is -taken care of transparently by Pubnub class if cipher key is -provided at time of initializing pubnub object

      -
      -
      Args:
      -
      message: Message to be encrypted.
      -
      Returns:
      -
      Returns encrypted message if cipher key is set
      -
      -
      - -
      -
      -grant(channel=None, auth_key=False, read=True, write=True, ttl=5, callback=None, error=None)
      -

      Method for granting permissions.

      -

      This function establishes subscribe and/or write permissions for -PubNub Access Manager (PAM) by setting the read or write attribute -to true. A grant with read or write set to false (or not included) -will revoke any previous grants with read or write set to true.

      -
      -
      Permissions can be applied to any one of three levels:
      -
        -
      1. Application level privileges are based on subscribe_key applying to all associated channels.
        2. -
      2. Channel level privileges are based on a combination of subscribe_key and channel name.
        3. -
      3. User level privileges are based on the combination of subscribe_key, channel and auth_key.
        4. -
      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to grant permissions to. -If channel is not specified, the grant applies to all -channels associated with the subscribe_key. If auth_key -is not specified, it is possible to grant permissions to -multiple channels simultaneously by specifying the channels -as a comma separated list.
      -
      auth_key: (string) (optional)
      -
      Specifies auth_key to grant permissions to. -It is possible to specify multiple auth_keys as comma -separated list in combination with a single channel name. -If auth_key is provided as the special-case value “null” -(or included in a comma-separated list, eg. “null,null,abc”), -a new auth_key will be generated and returned for each “null” value.
      -
      read: (boolean) (default: True)
      -
      Read permissions are granted by setting to True. -Read permissions are removed by setting to False.
      -
      write: (boolean) (default: True)
      -
      Write permissions are granted by setting to true. -Write permissions are removed by setting to false.
      -
      ttl: (int) (default: 1440 i.e 24 hrs)
      -
      Time in minutes for which granted permissions are valid. -Max is 525600 , Min is 1. -Setting ttl to 0 will apply the grant indefinitely.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response: -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -

      “ttl”:5, -“auths”:{

      -
      -
      “my_ro_authkey”:{“r”:1,”w”:0}
      -

      }, -“subscribe_key”:”my_subkey”, -“level”:”user”, -“channel”:”my_channel”

      -
      -

      }

      -
      -

      }

      -
      -
      -
      - -
      -
      -here_now(channel, callback=None, error=None)
      -

      Get here now data.

      -

      You can obtain information about the current state of a channel including -a list of unique user-ids currently subscribed to the channel and the total -occupancy count of the channel by calling the here_now() function in your -application.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies the channel name to return occupancy results. -If channel is not provided, here_now will return data for all channels.
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      error: (optional)
      -
      Optional variable. An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Sync Mode: list -Async Mode: None

      -

      Response Format:

      -

      The here_now() method returns a list of uuid s currently subscribed to the channel.

      -

      uuids:[“String”,”String”, ... ,”String”] - List of UUIDs currently subscribed to the channel.

      -

      occupancy: Number - Total current occupancy of the channel.

      -

      Example Response: -{

      -
      -

      occupancy: 4, -uuids: [

      -
      -
      ‘123123234t234f34fq3dq’, -‘143r34f34t34fq34q34q3’, -‘23f34d3f4rq34r34rq23q’, -‘w34tcw45t45tcw435tww3’,
      -

      ]

      -
      -

      }

      -
      -
      -
      - -
      -
      -history(channel, count=100, reverse=False, start=None, end=None, callback=None, error=None)
      -

      This method fetches historical messages of a channel.

      -

      PubNub Storage/Playback Service provides real-time access to an unlimited -history for all messages published to PubNub. Stored messages are replicated -across multiple availability zones in several geographical data center -locations. Stored messages can be encrypted with AES-256 message encryption -ensuring that they are not readable while stored on PubNub’s network.

      -

      It is possible to control how messages are returned and in what order, -for example you can:

      -
      -

      Return messages in the order newest to oldest (default behavior).

      -

      Return messages in the order oldest to newest by setting reverse to true.

      -

      Page through results by providing a start or end time token.

      -

      Retrieve a “slice” of the time line by providing both a start and end time token.

      -

      Limit the number of messages to a specific quantity using the count parameter.

      -
      -
      -
      Args:
      -
      -
      channel: (string)
      -
      Specifies channel to return history messages from
      -
      count: (int) (default: 100)
      -
      Specifies the number of historical messages to return
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      error: (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a list in sync mode i.e. when callback argument is not given

      -
      -
      Sample Response:
      -
      [[“Pub1”,”Pub2”,”Pub3”,”Pub4”,”Pub5”],13406746729185766,13406746845892666]
      -
      -
      -
      -
      - -
      -
      -presence(channel, callback, error=None)
      -

      Subscribe to presence data on a channel.

      -
      -
      Only works in async mode
      -
      -
      Args:
      -

      channel: Channel name ( string ) on which to publish message -callback: A callback method should be passed to the method.

      -
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      error: Optional variable. An error method can be passed to the method.
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -
      None
      -
      -
      - -
      -
      -publish(channel, message, callback=None, error=None)
      -

      Publishes data on a channel.

      -

      The publish() method is used to send a message to all subscribers of a channel. -To publish a message you must first specify a valid publish_key at initialization. -A successfully published message is replicated across the PubNub Real-Time Network -and sent simultaneously to all subscribed clients on a channel.

      -
      -
      Messages in transit can be secured from potential eavesdroppers with SSL/TLS by
      -

      setting ssl to True during initialization.

      -

      Published messages can also be encrypted with AES-256 simply by specifying a cipher_key -during initialization.

      -
      -
      Args:
      -
      -
      channel: (string)
      -
      Specifies channel name to publish messages to.
      -
      message: (string/int/double/dict/list)
      -
      Message to be published
      -
      callback: (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      -
      -
      Returns:
      -

      Sync Mode : list -Async Mode : None

      -

      The function returns the following formatted response:

      -
      -
      [ Number, “Status”, “Time Token”]
      -

      The output below demonstrates the response to a successful call:

      -
      -
      [1,”Sent”,”13769558699541401”]
      -
      -
      -
      - -
      -
      -revoke(channel=None, auth_key=None, ttl=1, callback=None, error=None)
      -

      Method for revoking permissions.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to revoke permissions to. -If channel is not specified, the revoke applies to all -channels associated with the subscribe_key. If auth_key -is not specified, it is possible to grant permissions to -multiple channels simultaneously by specifying the channels -as a comma separated list.
      -
      auth_key: (string) (optional)
      -
      Specifies auth_key to revoke permissions to. -It is possible to specify multiple auth_keys as comma -separated list in combination with a single channel name. -If auth_key is provided as the special-case value “null” -(or included in a comma-separated list, eg. “null,null,abc”), -a new auth_key will be generated and returned for each “null” value.
      -
      ttl: (int) (default: 1440 i.e 24 hrs)
      -
      Time in minutes for which granted permissions are valid. -Max is 525600 , Min is 1. -Setting ttl to 0 will apply the grant indefinitely.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response: -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -

      “ttl”:5, -“auths”:{

      -
      -
      “my_authkey”:{“r”:0,”w”:0}
      -

      }, -“subscribe_key”:”my_subkey”, -“level”:”user”, -“channel”:”my_channel”

      -
      -

      }

      -
      -

      }

      -
      -
      -
      - -
      -
      -subscribe(channels, callback, error=None, connect=None, disconnect=None, reconnect=None, sync=False)
      -

      Subscribe to data on a channel.

      -

      This function causes the client to create an open TCP socket to the -PubNub Real-Time Network and begin listening for messages on a specified channel. -To subscribe to a channel the client must send the appropriate subscribe_key at -initialization.

      -

      Only works in async mode

      -
      -
      Args:
      -
      -
      channel: (string/list)
      -
      Specifies the channel to subscribe to. It is possible to specify -multiple channels as a comma separated list or andarray.
      -
      callback: (function)
      -
      This callback is called on receiving a message from the channel.
      -
      error: (function) (optional)
      -
      This callback is called on an error event
      -
      connect: (function) (optional)
      -
      This callback is called on a successful connection to the PubNub cloud
      -
      disconnect: (function) (optional)
      -
      This callback is called on client disconnect from the PubNub cloud
      -
      reconnect: (function) (optional)
      -
      This callback is called on successfully re-connecting to the PubNub cloud
      -
      -
      -
      Returns:
      -
      None
      -
      -
      - -
      -
      -time(callback=None)
      -

      This function will return a 17 digit precision Unix epoch.

      -

      Args:

      -
      -
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      -
      Returns:
      -

      Returns a 17 digit number in sync mode i.e. when callback argument is not given

      -
      -
      Sample:
      -
      13769501243685161
      -
      -
      -
      -
      - -
      -
      -unsubscribe(channel)
      -
      -
      Subscribe to presence data on a channel.
      -
      Only works in async mode
      -
      Args:
      -

      channel: Channel name ( string ) on which to publish message -message: Message to be published ( String / int / double / dict / list ). -callback: A callback method should be passed to the method.

      -
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      error: Optional variable. An error method can be passed to the method.
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -
      Returns a list in sync mode i.e. when callback argument is not given
      -
      -
      - -
      - -
      -
      -

      PubnubTornado

      -
      -
      -class Pubnub.PubnubTornado(publish_key, subscribe_key, secret_key=False, cipher_key=False, auth_key=False, ssl_on=False, origin='pubsub.pubnub.com')
      -
      -
      -audit(channel=None, auth_key=None, callback=None, error=None)
      -

      Method for fetching permissions from pubnub servers.

      -

      This method provides a mechanism to reveal existing PubNub Access Manager attributes -for any combination of subscribe_key, channel and auth_key.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to return PAM -attributes optionally in combination with auth_key. -If channel is not specified, results for all channels -associated with subscribe_key are returned. -If auth_key is not specified, it is possible to return -results for a comma separated list of channels.
      -
      auth_key: (string) (optional)
      -
      Specifies the auth_key to return PAM attributes for. -If only a single channel is specified, it is possible to return -results for a comma separated list of auth_keys.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -
      -
      “channels”:{
      -
      -
      “my_channel”:{
      -
      “auths”:{“my_ro_authkey”:{“r”:1,”w”:0}, -“my_rw_authkey”:{“r”:0,”w”:1}, -“my_admin_authkey”:{“r”:1,”w”:1}
      -
      -

      }

      -
      -
      -

      }

      -
      -

      },

      -
      -

      }

      -
      -
      -

      Usage:

      -
      -
      pubnub.audit (‘my_channel’); # Sync Mode
      -
      - -
      -
      -decrypt(message)
      -

      Method for decrypting data.

      -

      This method takes ciphertext as input and returns decrypted data. -This need not be called directly as enncryption/decryption is -taken care of transparently by Pubnub class if cipher key is -provided at time of initializing pubnub object

      -
      -
      Args:
      -
      message: Message to be decrypted.
      -
      Returns:
      -
      Returns decrypted message if cipher key is set
      -
      -
      - -
      -
      -encrypt(message)
      -

      Method for encrypting data.

      -

      This method takes plaintext as input and returns encrypted data. -This need not be called directly as enncryption/decryption is -taken care of transparently by Pubnub class if cipher key is -provided at time of initializing pubnub object

      -
      -
      Args:
      -
      message: Message to be encrypted.
      -
      Returns:
      -
      Returns encrypted message if cipher key is set
      -
      -
      - -
      -
      -grant(channel=None, auth_key=False, read=True, write=True, ttl=5, callback=None, error=None)
      -

      Method for granting permissions.

      -

      This function establishes subscribe and/or write permissions for -PubNub Access Manager (PAM) by setting the read or write attribute -to true. A grant with read or write set to false (or not included) -will revoke any previous grants with read or write set to true.

      -
      -
      Permissions can be applied to any one of three levels:
      -
        -
      1. Application level privileges are based on subscribe_key applying to all associated channels.
        2. -
      2. Channel level privileges are based on a combination of subscribe_key and channel name.
        3. -
      3. User level privileges are based on the combination of subscribe_key, channel and auth_key.
        4. -
      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to grant permissions to. -If channel is not specified, the grant applies to all -channels associated with the subscribe_key. If auth_key -is not specified, it is possible to grant permissions to -multiple channels simultaneously by specifying the channels -as a comma separated list.
      -
      auth_key: (string) (optional)
      -
      Specifies auth_key to grant permissions to. -It is possible to specify multiple auth_keys as comma -separated list in combination with a single channel name. -If auth_key is provided as the special-case value “null” -(or included in a comma-separated list, eg. “null,null,abc”), -a new auth_key will be generated and returned for each “null” value.
      -
      read: (boolean) (default: True)
      -
      Read permissions are granted by setting to True. -Read permissions are removed by setting to False.
      -
      write: (boolean) (default: True)
      -
      Write permissions are granted by setting to true. -Write permissions are removed by setting to false.
      -
      ttl: (int) (default: 1440 i.e 24 hrs)
      -
      Time in minutes for which granted permissions are valid. -Max is 525600 , Min is 1. -Setting ttl to 0 will apply the grant indefinitely.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response: -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -

      “ttl”:5, -“auths”:{

      -
      -
      “my_ro_authkey”:{“r”:1,”w”:0}
      -

      }, -“subscribe_key”:”my_subkey”, -“level”:”user”, -“channel”:”my_channel”

      -
      -

      }

      -
      -

      }

      -
      -
      -
      - -
      -
      -here_now(channel, callback=None, error=None)
      -

      Get here now data.

      -

      You can obtain information about the current state of a channel including -a list of unique user-ids currently subscribed to the channel and the total -occupancy count of the channel by calling the here_now() function in your -application.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies the channel name to return occupancy results. -If channel is not provided, here_now will return data for all channels.
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      error: (optional)
      -
      Optional variable. An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Sync Mode: list -Async Mode: None

      -

      Response Format:

      -

      The here_now() method returns a list of uuid s currently subscribed to the channel.

      -

      uuids:[“String”,”String”, ... ,”String”] - List of UUIDs currently subscribed to the channel.

      -

      occupancy: Number - Total current occupancy of the channel.

      -

      Example Response: -{

      -
      -

      occupancy: 4, -uuids: [

      -
      -
      ‘123123234t234f34fq3dq’, -‘143r34f34t34fq34q34q3’, -‘23f34d3f4rq34r34rq23q’, -‘w34tcw45t45tcw435tww3’,
      -

      ]

      -
      -

      }

      -
      -
      -
      - -
      -
      -history(channel, count=100, reverse=False, start=None, end=None, callback=None, error=None)
      -

      This method fetches historical messages of a channel.

      -

      PubNub Storage/Playback Service provides real-time access to an unlimited -history for all messages published to PubNub. Stored messages are replicated -across multiple availability zones in several geographical data center -locations. Stored messages can be encrypted with AES-256 message encryption -ensuring that they are not readable while stored on PubNub’s network.

      -

      It is possible to control how messages are returned and in what order, -for example you can:

      -
      -

      Return messages in the order newest to oldest (default behavior).

      -

      Return messages in the order oldest to newest by setting reverse to true.

      -

      Page through results by providing a start or end time token.

      -

      Retrieve a “slice” of the time line by providing both a start and end time token.

      -

      Limit the number of messages to a specific quantity using the count parameter.

      -
      -
      -
      Args:
      -
      -
      channel: (string)
      -
      Specifies channel to return history messages from
      -
      count: (int) (default: 100)
      -
      Specifies the number of historical messages to return
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      error: (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a list in sync mode i.e. when callback argument is not given

      -
      -
      Sample Response:
      -
      [[“Pub1”,”Pub2”,”Pub3”,”Pub4”,”Pub5”],13406746729185766,13406746845892666]
      -
      -
      -
      -
      - -
      -
      -presence(channel, callback, error=None)
      -

      Subscribe to presence data on a channel.

      -
      -
      Only works in async mode
      -
      -
      Args:
      -

      channel: Channel name ( string ) on which to publish message -callback: A callback method should be passed to the method.

      -
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      error: Optional variable. An error method can be passed to the method.
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -
      None
      -
      -
      - -
      -
      -publish(channel, message, callback=None, error=None)
      -

      Publishes data on a channel.

      -

      The publish() method is used to send a message to all subscribers of a channel. -To publish a message you must first specify a valid publish_key at initialization. -A successfully published message is replicated across the PubNub Real-Time Network -and sent simultaneously to all subscribed clients on a channel.

      -
      -
      Messages in transit can be secured from potential eavesdroppers with SSL/TLS by
      -

      setting ssl to True during initialization.

      -

      Published messages can also be encrypted with AES-256 simply by specifying a cipher_key -during initialization.

      -
      -
      Args:
      -
      -
      channel: (string)
      -
      Specifies channel name to publish messages to.
      -
      message: (string/int/double/dict/list)
      -
      Message to be published
      -
      callback: (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      -
      -
      Returns:
      -

      Sync Mode : list -Async Mode : None

      -

      The function returns the following formatted response:

      -
      -
      [ Number, “Status”, “Time Token”]
      -

      The output below demonstrates the response to a successful call:

      -
      -
      [1,”Sent”,”13769558699541401”]
      -
      -
      -
      - -
      -
      -revoke(channel=None, auth_key=None, ttl=1, callback=None, error=None)
      -

      Method for revoking permissions.

      -
      -
      Args:
      -
      -
      channel: (string) (optional)
      -
      Specifies channel name to revoke permissions to. -If channel is not specified, the revoke applies to all -channels associated with the subscribe_key. If auth_key -is not specified, it is possible to grant permissions to -multiple channels simultaneously by specifying the channels -as a comma separated list.
      -
      auth_key: (string) (optional)
      -
      Specifies auth_key to revoke permissions to. -It is possible to specify multiple auth_keys as comma -separated list in combination with a single channel name. -If auth_key is provided as the special-case value “null” -(or included in a comma-separated list, eg. “null,null,abc”), -a new auth_key will be generated and returned for each “null” value.
      -
      ttl: (int) (default: 1440 i.e 24 hrs)
      -
      Time in minutes for which granted permissions are valid. -Max is 525600 , Min is 1. -Setting ttl to 0 will apply the grant indefinitely.
      -
      callback: (function) (optional)
      -
      A callback method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado
      -
      error: (function) (optional)
      -
      An error method can be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -

      Returns a dict in sync mode i.e. when callback argument is not given -The dict returned contains values with keys ‘message’ and ‘payload’

      -

      Sample Response: -{

      -
      -

      “message”:”Success”, -“payload”:{

      -
      -

      “ttl”:5, -“auths”:{

      -
      -
      “my_authkey”:{“r”:0,”w”:0}
      -

      }, -“subscribe_key”:”my_subkey”, -“level”:”user”, -“channel”:”my_channel”

      -
      -

      }

      -
      -

      }

      -
      -
      -
      - -
      -
      -subscribe(channels, callback, error=None, connect=None, disconnect=None, reconnect=None, sync=False)
      -

      Subscribe to data on a channel.

      -

      This function causes the client to create an open TCP socket to the -PubNub Real-Time Network and begin listening for messages on a specified channel. -To subscribe to a channel the client must send the appropriate subscribe_key at -initialization.

      -

      Only works in async mode

      -
      -
      Args:
      -
      -
      channel: (string/list)
      -
      Specifies the channel to subscribe to. It is possible to specify -multiple channels as a comma separated list or andarray.
      -
      callback: (function)
      -
      This callback is called on receiving a message from the channel.
      -
      error: (function) (optional)
      -
      This callback is called on an error event
      -
      connect: (function) (optional)
      -
      This callback is called on a successful connection to the PubNub cloud
      -
      disconnect: (function) (optional)
      -
      This callback is called on client disconnect from the PubNub cloud
      -
      reconnect: (function) (optional)
      -
      This callback is called on successfully re-connecting to the PubNub cloud
      -
      -
      -
      Returns:
      -
      None
      -
      -
      - -
      -
      -time(callback=None)
      -

      This function will return a 17 digit precision Unix epoch.

      -

      Args:

      -
      -
      -
      callback: (optional)
      -
      A callback method should be passed to the method. -If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      -
      Returns:
      -

      Returns a 17 digit number in sync mode i.e. when callback argument is not given

      -
      -
      Sample:
      -
      13769501243685161
      -
      -
      -
      -
      - -
      -
      -unsubscribe(channel)
      -
      -
      Subscribe to presence data on a channel.
      -
      Only works in async mode
      -
      Args:
      -

      channel: Channel name ( string ) on which to publish message -message: Message to be published ( String / int / double / dict / list ). -callback: A callback method should be passed to the method.

      -
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      error: Optional variable. An error method can be passed to the method.
      -
      If set, the api works in async mode. -Required argument when working with twisted or tornado .
      -
      -
      -
      Returns:
      -
      Returns a list in sync mode i.e. when callback argument is not given
      -
      -
      - -
      - -
      -
      -
      -

      Indices and tables

      - -
      - - -
      -
      -
      -
      -
      -

      Table Of Contents

      - - -

      This Page

      - - - -
      -
      -
      -
      -
      -

      Navigation

      - -
      -
      - © Copyright 2014, PubNub Inc.. - Created using Sphinx 1.2.2. -
      - - \ No newline at end of file diff --git a/docs/build/html/objects.inv b/docs/build/html/objects.inv deleted file mode 100644 index 645f0de564877e60b258a6cc59e75a3f8161d9b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 411 zcmV;M0c8FoAX9K?X>NERX>N99Zgg*Qc_4OWa&u{KZXhxWBOp+6Z)#;@bUGkVbz)9+ zVhST5R%LQ?X>V>iATusEE;b4yAXI2&AaZ4GVQFq;WpW^IW*~HEX>%ZEX>4U6X>%ZB zZ*6dLWpi_7WFU2OX>MmAdTeQ8E(&&u3bio@2 zhZ=d78rRU_S$p_86We{+yRz4x2^@*O&XT~0qwg!s&?dvO)W1@AzJl9rbfx)M&KJ(U F6xV3xyHEfC diff --git a/docs/build/html/py-modindex.html b/docs/build/html/py-modindex.html deleted file mode 100644 index da78366d..00000000 --- a/docs/build/html/py-modindex.html +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - Python Module Index — PubNub 3.7.6 documentation - - - - - - - - - - - - - - - - -
      -

      Navigation

      - -
      - -
      -
      -
      -
      - - -

      Python Module Index

      - -
      - p -
      - - - - - - - -
       
      - p
      - Pubnub -
      - - -
      -
      -
      -
      -
      - - -
      -
      -
      -
      -
      -

      Navigation

      - -
      -
      - © Copyright 2014, PubNub Inc.. - Created using Sphinx 1.2.2. -
      - - \ No newline at end of file diff --git a/docs/build/html/search.html b/docs/build/html/search.html deleted file mode 100644 index 6d5ac37e..00000000 --- a/docs/build/html/search.html +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - Search — PubNub 3.7.6 documentation - - - - - - - - - - - - - - - - - -
      -

      Navigation

      - -
      - -
      -
      -
      -
      - -

      Search

      -
      - -

      - Please activate JavaScript to enable the search - functionality. -

      -
      -

      - From here you can search these documents. Enter your search - words into the box below and click "search". Note that the search - function will automatically search for all of the words. Pages - containing fewer words won't appear in the result list. -

      -
      - - - -
      - -
      - -
      - -
      -
      -
      -
      -
      -
      -
      -
      -
      -
      -

      Navigation

      - -
      -
      - © Copyright 2014, PubNub Inc.. - Created using Sphinx 1.2.2. -
      - - \ No newline at end of file diff --git a/docs/build/html/searchindex.js b/docs/build/html/searchindex.js deleted file mode 100644 index 0bba8eda..00000000 --- a/docs/build/html/searchindex.js +++ /dev/null @@ -1 +0,0 @@ -Search.setIndex({envversion:42,terms:{"23f34d3f4rq34r34rq23q":0,all:0,newest:0,my_rw_authkei:0,obtain:0,tcp:0,ssl_on:0,reconnect:0,ttl:0,follow:0,twist:0,simultan:0,callback:0,cipher:0,paramet:0,access:0,onli:0,locat:0,uuid:0,zone:0,how:0,here_now:0,readabl:0,publish_kei:0,send:0,should:0,pub2:0,valid:0,dict:0,appli:0,input:0,sent:0,pubsub:0,real:0,applic:0,digit:0,"return":0,string:0,thei:0,transpar:0,fals:0,ciphertext:0,auth:0,ssl:0,mechan:0,now:0,requir:0,my_channel:0,reveal:0,daemon:0,name:0,specif:0,level:0,revers:0,list:0,geograph:0,privileg:0,server:0,separ:0,provid:0,token:0,api:0,mode:0,contain:0,comma:0,servic:0,set:0,specifi:0,permiss:0,my_admin_authkei:0,multipl:0,sync:0,my_ro_authkei:0,sampl:0,result:0,pass:0,pres_uuid:0,successfulli:0,event:0,special:0,page:0,variabl:0,index:0,what:0,oldest:0,network:0,channel:0,subscribe_kei:0,"while":0,publish:0,cipher_kei:0,current:0,method:0,state:0,pool:0,enncrypt:0,"new":0,get:0,across:0,attribut:0,object:0,kei:0,gener:0,each:0,usag:0,here:0,plaintext:0,base:0,async:0,disconnect:0,my_authkei:0,secret_kei:0,valu:0,care:0,both:0,about:0,output:0,socket:0,success:0,through:0,manag:0,precis:0,"123123234t234f34fq3dq":0,auth_kei:0,my_subkei:0,com:0,first:0,origin:0,arg:0,simpli:0,directli:0,revok:0,slice:0,transit:0,number:0,unix:0,"boolean":0,uniqu:0,ensur:0,total:0,storag:0,your:0,cloud:0,min:0,given:0,from:0,associ:0,doubl:0,three:0,messag:0,avail:0,start:0,call:0,includ:0,subscrib:0,taken:0,unsubscrib:0,store:0,listen:0,"function":0,option:0,presenc:0,search:0,andarrai:0,ani:0,line:0,"true":0,must:0,count:0,replic:0,none:0,retriev:0,possibl:0,"default":0,remov:0,work:0,histor:0,histori:0,below:0,limit:0,can:0,behavior:0,error:0,minut:0,initi:0,fetch:0,connect:0,control:0,payload:0,exampl:0,creat:0,"int":0,dure:0,respons:0,decrypt:0,argument:0,pub3:0,"case":0,pub1:0,exist:0,pub5:0,pub4:0,need:0,w34tcw45t45tcw435tww3:0,"null":0,sever:0,occup:0,end:0,open:0,grant:0,receiv:0,format:0,when:0,write:0,also:0,epoch:0,playback:0,take:0,which:0,indefinit:0,you:0,unlimit:0,singl:0,begin:0,thi:0,tornado:0,max:0,previou:0,"143r34f34t34fq34q34q3":0,statu:0,abc:0,user:0,establish:0,eavesdropp:0,encrypt:0,data:0,"class":0,demonstr:0,audit:0,appropri:0,center:0,read:0,secur:0,quantiti:0,caus:0,inform:0,client:0,combin:0,potenti:0,time:0,pam:0,order:0},objtypes:{"0":"py:module","1":"py:method","2":"py:class"},objnames:{"0":["py","module","Python module"],"1":["py","method","Python method"],"2":["py","class","Python class"]},filenames:["index"],titles:["Welcome to PubNub’s documentation!"],objects:{"":{Pubnub:[0,0,0,"-"]},"Pubnub.PubnubTornado":{audit:[0,1,1,""],revoke:[0,1,1,""],grant:[0,1,1,""],here_now:[0,1,1,""],decrypt:[0,1,1,""],publish:[0,1,1,""],presence:[0,1,1,""],subscribe:[0,1,1,""],unsubscribe:[0,1,1,""],time:[0,1,1,""],encrypt:[0,1,1,""],history:[0,1,1,""]},"Pubnub.PubnubTwisted":{audit:[0,1,1,""],revoke:[0,1,1,""],grant:[0,1,1,""],here_now:[0,1,1,""],presence:[0,1,1,""],decrypt:[0,1,1,""],publish:[0,1,1,""],subscribe:[0,1,1,""],unsubscribe:[0,1,1,""],time:[0,1,1,""],encrypt:[0,1,1,""],history:[0,1,1,""]},Pubnub:{PubnubTornado:[0,2,1,""],Pubnub:[0,2,1,""],PubnubTwisted:[0,2,1,""]},"Pubnub.Pubnub":{audit:[0,1,1,""],revoke:[0,1,1,""],here_now:[0,1,1,""],grant:[0,1,1,""],decrypt:[0,1,1,""],publish:[0,1,1,""],presence:[0,1,1,""],subscribe:[0,1,1,""],unsubscribe:[0,1,1,""],time:[0,1,1,""],encrypt:[0,1,1,""],history:[0,1,1,""]}},titleterms:{welcom:0,pubnub:0,indic:0,pubnubtwist:0,tabl:0,pubnubtornado:0,document:0}}) \ No newline at end of file diff --git a/docs/source/conf.py b/docs/source/conf.py deleted file mode 100644 index 8c17afad..00000000 --- a/docs/source/conf.py +++ /dev/null @@ -1,261 +0,0 @@ -# -*- coding: utf-8 -*- -# -# PubNub documentation build configuration file, created by -# sphinx-quickstart on Wed Jun 25 12:50:44 2014. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys -import os -sys.path.insert(0, os.path.abspath('../..')) - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ------------------------------------------------ - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = [ - 'sphinx.ext.autodoc', -] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'PubNub' -copyright = u'2014, PubNub Inc.' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '3.7.6' -# The full version, including alpha/beta/rc tags. -release = '3.7.6' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = [] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'default' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Output file base name for HTML help builder. -htmlhelp_basename = 'PubNubdoc' - - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - ('index', 'PubNub.tex', u'PubNub Documentation', - u'PubNub Inc.', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - ('index', 'pubnub', u'PubNub Documentation', - [u'PubNub Inc.'], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - ('index', 'PubNub', u'PubNub Documentation', - u'PubNub Inc.', 'PubNub', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False diff --git a/docs/source/index.rst b/docs/source/index.rst deleted file mode 100644 index 6b41e896..00000000 --- a/docs/source/index.rst +++ /dev/null @@ -1,35 +0,0 @@ -.. PubNub documentation master file, created by - sphinx-quickstart on Wed Jun 25 12:50:44 2014. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to PubNub's documentation! -================================== - -.. toctree:: - :maxdepth: 5 - -.. automodule:: Pubnub - -Pubnub ---------------------------------- -.. autoclass:: Pubnub - :members: publish, subscribe, subscribe_group, unsubscribe, unsubscribe_group, presence, presence_group, history, here_now, grant, audit, revoke, get_origin, set_origin, get_auth_key, set_auth_key, encrypt, decrypt, time, channel_group_list_namespaces, channel_group_remove_namespace, channel_group_list_groups, channel_group_list_channels, channel_groups_add_channel, channel_group_remove_channel, channel_group_remove_group - -PubnubTwisted ---------------------------------- -.. autoclass:: PubnubTwisted - :members: publish, subscribe, subscribe_group, unsubscribe, unsubscribe_group, presence, presence_group, history, here_now, grant, audit, revoke, get_origin, set_origin, get_auth_key, set_auth_key, encrypt, decrypt, time, channel_group_list_namespaces, channel_group_remove_namespace, channel_group_list_groups, channel_group_list_channels, channel_groups_add_channel, channel_group_remove_channel, channel_group_remove_group - - -PubnubTornado ---------------------------------- -.. autoclass:: PubnubTornado - :members: publish, subscribe, subscribe_group, unsubscribe, unsubscribe_group, presence, presence_group, history, here_now, grant, audit, revoke, get_origin, set_origin, get_auth_key, set_auth_key, encrypt, decrypt, time, channel_group_list_namespaces, channel_group_remove_namespace, channel_group_list_groups, channel_group_list_channels, channel_groups_add_channel, channel_group_remove_channel, channel_group_remove_group - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`search` - diff --git a/pubnub.py b/pubnub.py deleted file mode 100755 index 0fcd651b..00000000 --- a/pubnub.py +++ /dev/null @@ -1,2927 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2016 Stephen Blum -# http://www.pubnub.com/ - -# ----------------------------------- -# PubNub 3.7.6 Real-time Push Cloud API -# ----------------------------------- - - -try: - import json -except ImportError: - import simplejson as json - -import copy -import hashlib -import hmac -import random -import sys -import time -import uuid as uuid_lib -from Crypto.Cipher import AES -from base64 import encodestring, decodestring -from base64 import urlsafe_b64encode - -try: - from hashlib import sha256 - digestmod = sha256 -except ImportError: - import Crypto.Hash.SHA256 as digestmod - sha256 = digestmod.new - - -# vanilla python imports -try: - from urllib.parse import quote -except ImportError: - from urllib2 import quote -try: - import urllib.request -except ImportError: - import urllib2 - -try: - import requests - from requests.adapters import HTTPAdapter -except ImportError: - pass - -#import urllib -import socket -import threading - -try: - import urllib3.HTTPConnection - default_socket_options = urllib3.HTTPConnection.default_socket_options -except: - default_socket_options = [] - -default_socket_options += [ - # Enable TCP keepalive - (socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) -] - -if sys.platform.startswith("linux"): - default_socket_options += [ - # Send first keepalive packet 200 seconds after last data packet - (socket.IPPROTO_TCP, socket.TCP_KEEPIDLE, 200), - # Resend keepalive packets every second, when unanswered - (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 1), - # Close the socket after 5 unanswered keepalive packets - (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 5) - ] -elif sys.platform.startswith("darwin"): - # From /usr/include/netinet/tcp.h - - # idle time used when SO_KEEPALIVE is enabled - socket.TCP_KEEPALIVE = socket.TCP_KEEPALIVE \ - if hasattr(socket, 'TCP_KEEPALIVE') \ - else 0x10 - - # interval between keepalives - socket.TCP_KEEPINTVL = socket.TCP_KEEPINTVL \ - if hasattr(socket, 'TCP_KEEPINTVL') \ - else 0x101 - - # number of keepalives before close - socket.TCP_KEEPCNT = socket.TCP_KEEPCNT \ - if hasattr(socket, 'TCP_KEEPCNT') \ - else 0x102 - - default_socket_options += [ - # Send first keepalive packet 200 seconds after last data packet - (socket.IPPROTO_TCP, socket.TCP_KEEPALIVE, 200), - # Resend keepalive packets every second, when unanswered - (socket.IPPROTO_TCP, socket.TCP_KEEPINTVL, 1), - # Close the socket after 5 unanswered keepalive packets - (socket.IPPROTO_TCP, socket.TCP_KEEPCNT, 5) - ] -""" -# The Windows code is currently untested -elif sys.platform.startswith("win"): - import struct - from urllib3.connectionpool import HTTPConnectionPool, HTTPSConnectionPool - - def patch_socket_keepalive(conn): - conn.sock.ioctl(socket.SIO_KEEPALIVE_VALS, ( - # Enable TCP keepalive - 1, - # Send first keepalive packet 200 seconds after last data packet - 200, - # Resend keepalive packets every second, when unanswered - 1 - )) - - class PubnubHTTPConnectionPool(HTTPConnectionPool): - def _validate_conn(self, conn): - super(PubnubHTTPConnectionPool, self)._validate_conn(conn) - - class PubnubHTTPSConnectionPool(HTTPSConnectionPool): - def _validate_conn(self, conn): - super(PubnubHTTPSConnectionPool, self)._validate_conn(conn) - - import urllib3.poolmanager - urllib3.poolmanager.pool_classes_by_scheme = { - 'http' : PubnubHTTPConnectionPool, - 'https' : PubnubHTTPSConnectionPool - } -""" - -################################## - - -# Tornado imports and globals -try: - import tornado.httpclient - import tornado.ioloop - from tornado.stack_context import ExceptionStackContext - ioloop = tornado.ioloop.IOLoop.instance() -except ImportError: - pass - -####################################### - - -# Twisted imports and globals -try: - from twisted.internet import reactor - from twisted.internet.defer import Deferred - from twisted.internet.protocol import Protocol - from twisted.web.client import Agent, ContentDecoderAgent - from twisted.web.client import RedirectAgent, GzipDecoder - from twisted.web.client import HTTPConnectionPool - from twisted.web.http_headers import Headers - from twisted.internet.ssl import ClientContextFactory - import twisted - - pnconn_pool = HTTPConnectionPool(reactor, persistent=True) - pnconn_pool.maxPersistentPerHost = 100000 - pnconn_pool.cachedConnectionTimeout = 15 - pnconn_pool.retryAutomatically = True - - class WebClientContextFactory(ClientContextFactory): - def getContext(self, hostname, port): - return ClientContextFactory.getContext(self) - - class PubNubPamResponse(Protocol): - def __init__(self, finished): - self.finished = finished - - def dataReceived(self, bytes): - self.finished.callback(bytes) - - class PubNubResponse(Protocol): - def __init__(self, finished): - self.finished = finished - self.data = "" - - def dataReceived(self, bytes): - self.data += bytes - - def connectionLost(self, reason): - self.finished.callback(self.data) - - -except ImportError: - pass - -####################################### - - -def get_data_for_user(data): - try: - if 'message' in data and 'payload' in data: - return {'message': data['message'], 'payload': data['payload']} - else: - return data - except TypeError: - return data - - -class PubnubCrypto2(): - - def pad(self, msg, block_size=16): - - padding = block_size - (len(msg) % block_size) - return msg + chr(padding) * padding - - def depad(self, msg): - - return msg[0:-ord(msg[-1])] - - def getSecret(self, key): - - return hashlib.sha256(key).hexdigest() - - def encrypt(self, key, msg): - secret = self.getSecret(key) - Initial16bytes = '0123456789012345' - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) - enc = encodestring(cipher.encrypt(self.pad(msg))) - return enc - - def decrypt(self, key, msg): - - try: - secret = self.getSecret(key) - Initial16bytes = '0123456789012345' - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) - plain = self.depad(cipher.decrypt(decodestring(msg))) - except: - return msg - try: - return json.loads(plain) - except SyntaxError: - return plain - - -class PubnubCrypto3(): - - def pad(self, msg, block_size=16): - - padding = block_size - (len(msg) % block_size) - return msg + (chr(padding) * padding).encode('utf-8') - - def depad(self, msg): - - return msg[0:-ord(msg[-1])] - - def getSecret(self, key): - - return hashlib.sha256(key.encode("utf-8")).hexdigest() - - def encrypt(self, key, msg): - - secret = self.getSecret(key) - Initial16bytes = '0123456789012345' - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) - return encodestring( - cipher.encrypt(self.pad(msg.encode('utf-8')))).decode('utf-8') - - def decrypt(self, key, msg): - - secret = self.getSecret(key) - Initial16bytes = '0123456789012345' - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) - return (cipher.decrypt( - decodestring(msg.encode('utf-8')))).decode('utf-8') - - -class PubnubBase(object): - def __init__( - self, - publish_key, - subscribe_key, - secret_key=False, - cipher_key=False, - auth_key=None, - ssl_on=False, - origin='pubsub.pubnub.com', - uuid=None - ): - """Pubnub Class - - Provides methods to communicate with Pubnub cloud - - Attributes: - publish_key: Publish Key - subscribe_key: Subscribe Key - secret_key: Secret Key - cipher_key: Cipher Key - auth_key: Auth Key (used with Pubnub Access Manager i.e. PAM) - ssl: SSL enabled ? - origin: Origin - """ - - self.origin = origin - self.version = '3.7.6' - self.limit = 1800 - self.publish_key = publish_key - self.subscribe_key = subscribe_key - self.secret_key = secret_key - self.cipher_key = cipher_key - self.ssl = ssl_on - self.auth_key = auth_key - self.STATE = {} - self.http_debug = None - - if self.ssl: - self.origin = 'https://' + self.origin - else: - self.origin = 'http://' + self.origin - - self.uuid = uuid or str(uuid_lib.uuid4()) - - if type(sys.version_info) is tuple: - self.python_version = 2 - self.pc = PubnubCrypto2() - else: - if sys.version_info.major == 2: - self.python_version = 2 - self.pc = PubnubCrypto2() - else: - self.python_version = 3 - self.pc = PubnubCrypto3() - - if not isinstance(self.uuid, str): - raise AttributeError("uuid must be a string") - - def set_http_debug(self, func=None): - self.http_debug = func - - def _pam_sign(self, msg): - - sign = urlsafe_b64encode(hmac.new( - self.secret_key.encode("utf-8"), - msg.encode("utf-8"), - sha256 - ).digest()) - return quote(sign, safe="") - - def set_u(self, u=False): - self.u = u - - def _pam_auth(self, query, apicode=0, callback=None, error=None): - - if 'timestamp' not in query: - query['timestamp'] = int(time.time()) - - ## Global Grant? - if 'auth' in query and not query['auth']: - del query['auth'] - - if 'channel' in query and not query['channel']: - del query['channel'] - - if 'channel-group' in query and not query['channel-group']: - del query['channel-group'] - - params = "&".join([ - x + "=" + quote( - str(query[x]), safe="" - ) for x in sorted(query) - ]) - sign_input = "{subkey}\n{pubkey}\n{apitype}\n{params}".format( - subkey=self.subscribe_key, - pubkey=self.publish_key, - apitype="audit" if (apicode) else "grant", - params=params - ) - query['signature'] = self._pam_sign(sign_input) - - return self._request({"urlcomponents": [ - 'v1', 'auth', "audit" if (apicode) else "grant", - 'sub-key', - self.subscribe_key - ], 'urlparams': query}, - self._return_wrapped_callback(callback), - self._return_wrapped_callback(error), - encoder_map={'signature': self._encode_pam}) - - def get_origin(self): - return self.origin - - def set_auth_key(self, auth_key): - self.auth_key = auth_key - - def get_auth_key(self): - return self.auth_key - - def grant(self, channel=None, channel_group=None, auth_key=False, - read=False, write=False, manage=False, ttl=5, callback=None, - error=None): - """Method for granting permissions. - - This function establishes subscribe and/or write permissions for - PubNub Access Manager (PAM) by setting the read or write attribute - to true. A grant with read or write set to false (or not included) - will revoke any previous grants with read or write set to true. - - Permissions can be applied to any one of three levels: - 1. Application level privileges are based on subscribe_key applying - to all associated channels. - 2. Channel level privileges are based on a combination of - subscribe_key and channel name. - 3. User level privileges are based on the combination of - subscribe_key, channel and auth_key. - - Args: - channel: (string) (optional) - Specifies channel name to grant permissions to. - If channel/channel_group is not specified, the grant - applies to all channels associated with the - subscribe_key. If auth_key is not specified, it is - possible to grant permissions to multiple channels - simultaneously by specifying the channels - as a comma separated list. - channel_group: (string) (optional) - Specifies channel group name to grant permissions to. - If channel/channel_group is not specified, the grant - applies to all channels associated with the - subscribe_key. If auth_key is not specified, it is - possible to grant permissions to multiple channel - groups simultaneously by specifying the channel groups - as a comma separated list. - - auth_key: (string) (optional) - Specifies auth_key to grant permissions to. - It is possible to specify multiple auth_keys as comma - separated list in combination with a single channel - name. If auth_key is provided as the special-case - value "null" (or included in a comma-separated list, - eg. "null,null,abc"), a new auth_key will be generated - and returned for each "null" value. - - read: (boolean) (default: True) - Read permissions are granted by setting to True. - Read permissions are removed by setting to False. - - write: (boolean) (default: True) - Write permissions are granted by setting to true. - Write permissions are removed by setting to false. - manage: (boolean) (default: True) - Manage permissions are granted by setting to true. - Manage permissions are removed by setting to false. - - ttl: (int) (default: 1440 i.e 24 hrs) - Time in minutes for which granted permissions are - valid. Max is 525600 , Min is 1. - Setting ttl to 0 will apply the grant indefinitely. - - callback: (function) (optional) - A callback method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or tornado - - error: (function) (optional) - An error method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or tornado - - Returns: - Returns a dict in sync mode i.e. when callback argument is not - given - The dict returned contains values with keys 'message' and 'payload' - - Sample Response: - { - "message":"Success", - "payload":{ - "ttl":5, - "auths":{ - "my_ro_authkey":{"r":1,"w":0} - }, - "subscribe_key":"my_subkey", - "level":"user", - "channel":"my_channel" - } - } - """ - - return self._pam_auth({ - 'channel': channel, - 'channel-group': channel_group, - 'auth': auth_key, - 'r': read and 1 or 0, - 'w': write and 1 or 0, - 'm': manage and 1 or 0, - 'ttl': ttl, - 'pnsdk': self.pnsdk - }, callback=callback, error=error) - - def revoke(self, channel=None, channel_group=None, auth_key=None, ttl=1, - callback=None, error=None): - """Method for revoking permissions. - - Args: - channel: (string) (optional) - Specifies channel name to revoke permissions to. - If channel/channel_group is not specified, the revoke - applies to all channels associated with the - subscribe_key. If auth_key is not specified, it is - possible to grant permissions to multiple channels - simultaneously by specifying the channels as a comma - separated list. - - channel_group: (string) (optional) - Specifies channel group name to revoke permissions to. - If channel/channel_group is not specified, the grant - applies to all channels associated with the - subscribe_key. If auth_key is not specified, it is - possible to revoke permissions to multiple channel - groups simultaneously by specifying the channel groups - as a comma separated list. - - auth_key: (string) (optional) - Specifies auth_key to revoke permissions to. - It is possible to specify multiple auth_keys as comma - separated list in combination with a single channel - name. If auth_key is provided as the special-case - value "null" (or included in a comma-separated list, - eg. "null,null,abc"), a new auth_key will be generated - and returned for each "null" value. - - ttl: (int) (default: 1440 i.e 24 hrs) - Time in minutes for which granted permissions are - valid. - Max is 525600 , Min is 1. - Setting ttl to 0 will apply the grant indefinitely. - - callback: (function) (optional) - A callback method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (function) (optional) - An error method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Returns a dict in sync mode i.e. when callback argument is not - given. - The dict returned contains values with keys 'message' and 'payload' - - Sample Response: - { - "message":"Success", - "payload":{ - "ttl":5, - "auths":{ - "my_authkey":{"r":0,"w":0} - }, - "subscribe_key":"my_subkey", - "level":"user", - "channel":"my_channel" - } - } - - """ - - return self._pam_auth({ - 'channel': channel, - 'channel-group': channel_group, - 'auth': auth_key, - 'r': 0, - 'w': 0, - 'ttl': ttl, - 'pnsdk': self.pnsdk - }, callback=callback, error=error) - - def audit(self, channel=None, channel_group=None, auth_key=None, - callback=None, error=None): - """Method for fetching permissions from pubnub servers. - - This method provides a mechanism to reveal existing PubNub Access - Manager attributes for any combination of subscribe_key, channel - and auth_key. - - Args: - channel: (string) (optional) - Specifies channel name to return PAM - attributes optionally in combination with auth_key. - If channel/channel_group is not specified, results - for all channels associated with subscribe_key are - returned. If auth_key is not specified, it is possible - to return results for a comma separated list of - channels. - channel_group: (string) (optional) - Specifies channel group name to return PAM - attributes optionally in combination with auth_key. - If channel/channel_group is not specified, results - for all channels associated with subscribe_key are - returned. If auth_key is not specified, it is possible - to return results for a comma separated list of - channels. - - auth_key: (string) (optional) - Specifies the auth_key to return PAM attributes for. - If only a single channel is specified, it is possible - to return results for a comma separated list of - auth_keys. - - callback: (function) (optional) - A callback method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (function) (optional) - An error method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Returns a dict in sync mode i.e. when callback argument is not - given - The dict returned contains values with keys 'message' and 'payload' - - Sample Response - { - "message":"Success", - "payload":{ - "channels":{ - "my_channel":{ - "auths":{"my_ro_authkey":{"r":1,"w":0}, - "my_rw_authkey":{"r":0,"w":1}, - "my_admin_authkey":{"r":1,"w":1} - } - } - }, - } - - Usage: - - pubnub.audit ('my_channel'); # Sync Mode - - """ - - return self._pam_auth({ - 'channel': channel, - 'channel-group': channel_group, - 'auth': auth_key, - 'pnsdk': self.pnsdk - }, 1, callback=callback, error=error) - - def encrypt(self, message): - """Method for encrypting data. - - This method takes plaintext as input and returns encrypted data. - This need not be called directly as enncryption/decryption is - taken care of transparently by Pubnub class if cipher key is - provided at time of initializing pubnub object - - Args: - message: Message to be encrypted. - - Returns: - Returns encrypted message if cipher key is set - """ - if self.cipher_key: - message = json.dumps(self.pc.encrypt( - self.cipher_key, json.dumps(message)).replace('\n', '')) - else: - message = json.dumps(message) - - return message - - def decrypt(self, message): - """Method for decrypting data. - - This method takes ciphertext as input and returns decrypted data. - This need not be called directly as enncryption/decryption is - taken care of transparently by Pubnub class if cipher key is - provided at time of initializing pubnub object - - Args: - message: Message to be decrypted. - - Returns: - Returns decrypted message if cipher key is set - """ - if self.cipher_key: - message = self.pc.decrypt(self.cipher_key, message) - - return message - - def _return_wrapped_callback(self, callback=None): - def _new_format_callback(response): - if self.http_debug is not None: - self.http_debug(response) - if 'payload' in response: - if (callback is not None): - callback_data = dict() - callback_data['payload'] = response['payload'] - - if 'message' in response: - callback_data['message'] = response['message'] - - if (callback is not None): - callback(callback_data) - else: - if (callback is not None): - callback(response) - if (callback is not None): - return _new_format_callback - else: - return None - - def leave_channel(self, channel, callback=None, error=None): - ## Send leave - return self._request({"urlcomponents": [ - 'v2', 'presence', - 'sub_key', - self.subscribe_key, - 'channel', - channel, - 'leave' - ], 'urlparams': - {'auth': self.auth_key, 'pnsdk': self.pnsdk, "uuid": self.uuid, }}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def leave_group(self, channel_group, callback=None, error=None): - ## Send leave - return self._request({"urlcomponents": [ - 'v2', 'presence', - 'sub_key', - self.subscribe_key, - 'channel', - ',', - 'leave' - ], 'urlparams': - {'auth': self.auth_key, 'pnsdk': self.pnsdk, - 'channel-group': channel_group, - "uuid": self.uuid, }}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def publish(self, channel, message, callback=None, error=None): - """Publishes data on a channel. - - The publish() method is used to send a message to all subscribers of - a channel. To publish a message you must first specify a valid - publish_key at initialization. A successfully published message is - replicated across the PubNub Real-Time Network and sent simultaneously - to all subscribed clients on a channel. Messages in transit can be - secured from potential eavesdroppers with SSL/TLS by setting ssl to - True during initialization. - - Published messages can also be encrypted with AES-256 simply by - specifying a cipher_key during initialization. - - Args: - channel: (string) - Specifies channel name to publish messages to. - message: (string/int/double/dict/list) - Message to be published - callback: (optional) - A callback method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - error: (optional) - An error method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode : list - Async Mode : None - - The function returns the following formatted response: - - [ Number, "Status", "Time Token"] - - The output below demonstrates the response to a successful call: - - [1,"Sent","13769558699541401"] - - """ - - message = self.encrypt(message) - - ## Send Message - return self._request({"urlcomponents": [ - 'publish', - self.publish_key, - self.subscribe_key, - '0', - channel, - '0', - message - ], 'urlparams': {'auth': self.auth_key, 'pnsdk': self.pnsdk}}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def presence(self, channel, callback, error=None, connect=None, - disconnect=None, reconnect=None): - """Subscribe to presence events on a channel. - - Only works in async mode - - Args: - channel: Channel name ( string ) on which to listen for events - callback: A callback method should be passed as parameter. - If passed, the api works in async mode. - Required argument when working with twisted or tornado. - error: Optional variable. - An error method can be passed as - parameter. If set, the api works in async mode. - - Returns: - None - """ - return self.subscribe(channel + '-pnpres', callback=callback, - error=error, connect=connect, - disconnect=disconnect, - reconnect=reconnect) - - def presence_group(self, channel_group, callback, error=None, - connect=None, disconnect=None, reconnect=None): - """Subscribe to presence events on a channel group. - - Only works in async mode - - Args: - channel_group: Channel group name ( string ) - callback: A callback method should be passed to the method. - If passed, the api works in async mode. - Required argument when working with twisted or tornado. - error: Optional variable. An error method can be passed as - parameter. - If passed, the api works in async mode. - - Returns: - None - """ - return self.subscribe_group(channel_group + '-pnpres', - callback=callback, error=error, - connect=connect, - disconnect=disconnect, - reconnect=reconnect) - - def state(self, channel=None, channel_group=None, uuid=None, state=None, - callback=None, error=None): - """Get/Set state data. - - The state API is used to set key/value pairs specific to a subscriber - uuid. - State information is supplied as a dict of key/value pairs. - - - Args: - state: (string) (optional) - Specifies the channel name to return occupancy - results. If channel is not provided, here_now will - return data for all channels. - - uuid: (string) (optional) - The subscriber uuid to set state for or get current - state from. - Default is current uuid. - - channel: (string) (optional) - Specifies the channel for which state is to be - set/get. - - channel_group: (string) (optional) - Specifies the channel_group for which state is to - be set/get. - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed to - the method. If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: Object - Async Mode: None - - Response Format: - - The state API returns a JSON object containing key value pairs. - - Example Response: - { - first : "Robert", - last : "Plant", - age : 59, - region : "UK" - } - """ - data = {'auth': self.auth_key, 'pnsdk': self.pnsdk} - - try: - if (channel and self.subscriptions[channel] and - self.subscriptions[channel].subscribed and - state is not None): - self.STATE[channel] = state - except KeyError: - pass - - if channel_group and state is not None: - try: - if (self.subscription_groups[channel_group] and - self.subscription_groups[channel_group].subscribed): - self.STATE[channel_group] = state - except KeyError: - pass - - data['channel-group'] = channel_group - - if channel is None or len(channel) >= 0: - channel = ',' - - if uuid is None: - uuid = self.uuid - - if state is not None: - data['state'] = json.dumps(state) - urlcomponents = [ - 'v2', 'presence', - 'sub-key', self.subscribe_key, - 'channel', channel, - 'uuid', uuid, - 'data' - ] - else: - urlcomponents = [ - 'v2', 'presence', - 'sub-key', self.subscribe_key, - 'channel', channel, - 'uuid', uuid - ] - - ## Get Presence Here Now - return self._request({"urlcomponents": urlcomponents, - 'urlparams': data}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def where_now(self, uuid=None, callback=None, error=None): - """Get where now data. - - You can obtain information about the current list of a channels to - which a uuid is subscribed to by calling the where_now() function - in your application. - - - Args: - - uuid: (optional) - Specifies the uuid to return channel list for. - Default is current uuid. - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed - to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: list - Async Mode: None - - Response Format: - - The where_now() method returns a list of channels to which - uuid is currently subscribed. - - channels:["String","String", ... ,"String"] - List of Channels - uuid is currently subscribed to. - - Example Response: - { - "channels": - [ - "lobby", - "game01", - "chat" - ] - } - """ - - urlcomponents = [ - 'v2', 'presence', - 'sub_key', self.subscribe_key, - 'uuid' - ] - - if (uuid is not None and len(uuid) > 0): - urlcomponents.append(uuid) - else: - urlcomponents.append(self.uuid) - - data = {'auth': self.auth_key, 'pnsdk': self.pnsdk} - - ## Get Presence Where Now - return self._request({"urlcomponents": urlcomponents, - 'urlparams': data}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def here_now(self, channel, uuids=True, state=False, - callback=None, error=None): - """Get here now data. - - You can obtain information about the current state of a channel - including a list of unique user-ids currently subscribed to the - channel and the total occupancy count of the channel by calling - the here_now() function in your application. - - - Args: - channel: (string) (optional) - Specifies the channel name to return occupancy - results. If channel is not provided, here_now will - return data for all channels. - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed - to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado . - - Returns: - Sync Mode: list - Async Mode: None - - Response Format: - - The here_now() method returns a list of uuid s currently - subscribed to the channel. - - uuids:["String","String", ... ,"String"] - List of UUIDs currently - subscribed to the channel. - - occupancy: Number - Total current occupancy of the channel. - - Example Response: - { - occupancy: 4, - uuids: [ - '123123234t234f34fq3dq', - '143r34f34t34fq34q34q3', - '23f34d3f4rq34r34rq23q', - 'w34tcw45t45tcw435tww3', - ] - } - """ - - urlcomponents = [ - 'v2', 'presence', - 'sub_key', self.subscribe_key - ] - - if (channel is not None and len(channel) > 0): - urlcomponents.append('channel') - urlcomponents.append(channel) - - data = {'auth': self.auth_key, 'pnsdk': self.pnsdk} - - if state is True: - data['state'] = '1' - - if uuids is False: - data['disable_uuids'] = '1' - - ## Get Presence Here Now - return self._request({"urlcomponents": urlcomponents, - 'urlparams': data}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def history(self, channel, count=100, reverse=False, - start=None, end=None, include_token=False, callback=None, - error=None): - """This method fetches historical messages of a channel. - - PubNub Storage/Playback Service provides real-time access to an - unlimited history for all messages published to PubNub. Stored - messages are replicated across multiple availability zones in several - geographical data center locations. Stored messages can be encrypted - with AES-256 message encryption ensuring that they are not readable - while stored on PubNub's network. - - It is possible to control how messages are returned and in what order, - for example you can: - - Return messages in the order newest to oldest (default behavior). - - Return messages in the order oldest to newest by setting reverse - to true. - - Page through results by providing a start or end time token. - - Retrieve a "slice" of the time line by providing both a start - and end time token. - - Limit the number of messages to a specific quantity using - the count parameter. - - - - Args: - channel: (string) - Specifies channel to return history messages from - - count: (int) (default: 100) - Specifies the number of historical messages to return - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - An error method can be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Returns a list in sync mode i.e. when callback argument is not - given - - Sample Response: - [["Pub1","Pub2","Pub3","Pub4","Pub5"], - 13406746729185766,13406746845892666] - """ - - def _get_decrypted_history(resp): - try: - if (resp is not None and isinstance(resp, (list)) and - resp[1] is not None and self.cipher_key): - msgs = resp[0] - for i in range(0, len(msgs)): - msgs[i] = self.decrypt(msgs[i]) - except KeyError: - pass - return resp - - def _history_callback(resp): - if callback is not None: - callback(_get_decrypted_history(resp)) - - if callback is None: - history_cb = None - else: - history_cb = _history_callback - - params = dict() - - params['count'] = count - params['reverse'] = reverse - params['start'] = start - params['end'] = end - params['auth'] = self.auth_key - params['pnsdk'] = self.pnsdk - params['include_token'] = 'true' if include_token else 'false' - - # Get History - return _get_decrypted_history(self._request({'urlcomponents': [ - 'v2', - 'history', - 'sub-key', - self.subscribe_key, - 'channel', - channel, - ], 'urlparams': params}, - callback=self._return_wrapped_callback(history_cb), - error=self._return_wrapped_callback(error))) - - def time(self, callback=None): - """This function will return a 17 digit precision Unix epoch. - - Args: - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Returns a 17 digit number in sync mode i.e. when callback - argument is not given - - Sample: - 13769501243685161 - """ - - time = self._request({'urlcomponents': [ - 'time', - '0' - ]}, callback) - return time - - def _encode(self, request): - return [ - "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and - hex(ord(ch)).replace('0x', '%').upper() or - ch for ch in list(bit) - ]) for bit in request] - - def _encode_param(self, val): - return "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and - hex(ord(ch)).replace('0x', '%').upper() or - ch for ch in list(val)]) - - def _encode_pam(self, val): - return val - - def getUrl(self, request, encoder_map=None): - - if self.u is True and "urlparams" in request: - request['urlparams']['u'] = str(random.randint(1, 100000000000)) - ## Build URL - url = self.origin + '/' + "/".join([ - "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and - hex(ord(ch)).replace('0x', '%').upper() or - ch for ch in list(bit) - ]) for bit in request["urlcomponents"]]) - - if ("urlparams" in request): - url = url + '?' + "&".join([x + "=" + - (self._encode_param(str(y)) if encoder_map is None or x not in encoder_map else encoder_map[x](str(y))) - for x, y in request["urlparams"].items() if y is not None and len(str(y)) > 0]) - if self.http_debug is not None: - self.http_debug(url) - return url - - def _channel_registry(self, url=None, params=None, callback=None, - error=None): - - if (params is None): - params = dict() - - urlcomponents = ['v1', 'channel-registration', 'sub-key', - self.subscribe_key] - - if (url is not None): - urlcomponents += url - - params['auth'] = self.auth_key - params['pnsdk'] = self.pnsdk - - # Get History - return self._request({'urlcomponents': urlcomponents, - 'urlparams': params}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def _channel_group(self, channel_group=None, channels=None, cloak=None, - mode='add', callback=None, error=None): - params = dict() - url = [] - namespace = None - - if channel_group is not None and len(channel_group) > 0: - ns_ch_a = channel_group.split(':') - - if len(ns_ch_a) > 1: - namespace = None if ns_ch_a[0] == '*' else ns_ch_a[0] - channel_group = ns_ch_a[1] - else: - channel_group = ns_ch_a[0] - - if namespace is not None: - url.append('namespace') - url.append(self._encode(namespace)) - - url.append('channel-group') - - if channel_group is not None and channel_group != '*': - url.append(channel_group) - - if channels is not None: - if (type(channels) is list): - channels = ','.join(channels) - params[mode] = channels - # params['cloak'] = 'true' if CLOAK is True else 'false' - else: - if mode == 'remove': - url.append('remove') - - return self._channel_registry(url=url, params=params, - callback=callback, error=error) - - def channel_group_list_namespaces(self, callback=None, error=None): - """Get list of namespaces. - - You can obtain list of namespaces for the subscribe key associated with - PubNub object using this method. - - - Args: - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed - to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_list_namespaces method returns a dict which - contains list of namespaces in payload field - { - u'status': 200, - u'payload': { - u'sub_key': u'demo', - u'namespaces': [u'dev', u'foo'] - }, - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None (callback gets the response as parameter) - - Response Format: - - The callback passed to channel_group_list_namespaces gets the a - dict containing list of namespaces under payload field - - { - u'payload': { - u'sub_key': u'demo', - u'namespaces': [u'dev', u'foo'] - } - } - - namespaces is the list of namespaces for the given subscribe key - - - """ - - url = ['namespace'] - return self._channel_registry(url=url, callback=callback, error=error) - - def channel_group_remove_namespace(self, namespace, callback=None, - error=None): - """Remove a namespace. - - A namespace can be deleted using this method. - - - Args: - namespace: (string) namespace to be deleted - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed to - the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_remove_namespace method returns a dict indicating - status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None ( callback gets the response as parameter ) - - Response Format: - - The callback passed to channel_group_list_namespaces gets the a - dict indicating status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - """ - url = ['namespace', self._encode(namespace), 'remove'] - return self._channel_registry(url=url, callback=callback, error=error) - - def channel_group_list_groups(self, namespace=None, callback=None, - error=None): - """Get list of groups. - - Using this method, list of groups for the subscribe key associated - with PubNub object, can be obtained. If namespace is provided, groups - within the namespace only are listed - - Args: - namespace: (string) (optional) namespace - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed to - the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_list_groups method returns a dict which contains - list of groups in payload field - { - u'status': 200, - u'payload': {"namespace": "dev", "groups": ["abcd"]}, - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None ( callback gets the response as parameter ) - - Response Format: - - The callback passed to channel_group_list_namespaces gets the a - dict containing list of groups under payload field - - { - u'payload': {"namespace": "dev", "groups": ["abcd"]} - } - - - - """ - - if namespace is not None and len(namespace) > 0: - channel_group = namespace + ':*' - else: - channel_group = '*:*' - - return self._channel_group(channel_group=channel_group, - callback=callback, error=error) - - def channel_group_list_channels(self, channel_group, - callback=None, error=None): - """Get list of channels for a group. - - Using this method, list of channels for a group, can be obtained. - - Args: - channel_group: (string) (optional) - Channel Group name. It can also contain namespace. - If namespace is also specified, then the parameter - will be in format namespace:channel_group - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed to the - method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_list_channels method returns a dict which contains - list of channels in payload field - { - u'status': 200, - u'payload': {"channels": ["hi"], "group": "abcd"}, - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None ( callback gets the response as parameter ) - - Response Format: - - The callback passed to channel_group_list_channels gets the a - dict containing list of channels under payload field - - { - u'payload': {"channels": ["hi"], "group": "abcd"} - } - - - """ - return self._channel_group(channel_group=channel_group, - callback=callback, error=error) - - def channel_group_add_channel(self, channel_group, channel, - callback=None, error=None): - """Add a channel to group. - - A channel can be added to group using this method. - - - Args: - channel_group: (string) - Channel Group name. It can also contain namespace. - If namespace is also specified, then the parameter - will be in format namespace:channel_group - channel: (string) - Can be a channel name, a list of channel names, - or a comma separated list of channel names - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed to - the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_add_channel method returns a dict indicating - status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None ( callback gets the response as parameter ) - - Response Format: - - The callback passed to channel_group_add_channel gets the a - dict indicating status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - """ - - return self._channel_group(channel_group=channel_group, - channels=channel, mode='add', - callback=callback, error=error) - - def channel_group_remove_channel(self, channel_group, channel, - callback=None, error=None): - """Remove channel. - - A channel can be removed from a group method. - - - Args: - channel_group: (string) - Channel Group name. It can also contain namespace. - If namespace is also specified, then the parameter - will be in format namespace:channel_group - channel: (string) - Can be a channel name, a list of channel names, - or a comma separated list of channel names - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed - to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_remove_channel method returns a dict indicating - status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None ( callback gets the response as parameter ) - - Response Format: - - The callback passed to channel_group_remove_channel gets the - a dict indicating status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - """ - - return self._channel_group(channel_group=channel_group, - channels=channel, mode='remove', - callback=callback, error=error) - - def channel_group_remove_group(self, channel_group, - callback=None, error=None): - """Remove channel group. - - A channel group can be removed using this method. - - - Args: - channel_group: (string) - Channel Group name. It can also contain namespace. - If namespace is also specified, then the parameter - will be in format namespace:channel_group - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - error: (optional) - Optional variable. An error method can be passed - to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. - - Returns: - Sync Mode: dict - channel_group_remove_group method returns a dict indicating - status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - Async Mode: None ( callback gets the response as parameter ) - - Response Format: - - The callback passed to channel_group_remove_group gets the a - dict indicating status of the request - - { - u'status': 200, - u'message': 'OK', - u'service': u'channel-registry', - u'error': False - } - - """ - - return self._channel_group(channel_group=channel_group, - mode='remove', callback=callback, - error=error) - - -class EmptyLock(): - - def __init__(self): - pass - - def __enter__(self): - pass - - def __exit__(self, a, b, c): - pass - -empty_lock = EmptyLock() - - -class PubnubCoreAsync(PubnubBase): - - def start(self): - pass - - def stop(self): - self._reset_offline() - - def nop(self): - pass - - def __init__( - self, - publish_key, - subscribe_key, - secret_key=None, - cipher_key=None, - auth_key=None, - ssl_on=False, - origin='pubsub.pubnub.com', - uuid=None, - _tt_lock=empty_lock, - _channel_list_lock=empty_lock, - _channel_group_list_lock=empty_lock - ): - - super(PubnubCoreAsync, self).__init__( - publish_key=publish_key, - subscribe_key=subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - auth_key=auth_key, - ssl_on=ssl_on, - origin=origin, - uuid=uuid - ) - - self.subscriptions = {} - self.subscription_groups = {} - self.timetoken = 0 - self.last_timetoken = 0 - self.accept_encoding = 'gzip' - self.SUB_RECEIVER = None - self._connect = None - self._tt_lock = _tt_lock - self._channel_list_lock = _channel_list_lock - self._channel_group_list_lock = _channel_group_list_lock - self._connect = lambda: None - self.u = None - self.heartbeat = 0 - self.heartbeat_interval = 0 - self.heartbeat_running = False - self.heartbeat_stop_flag = False - self.abort_heartbeat = self.nop - self.heartbeat_callback = self.nop - self.heartbeat_error = self.nop - - def get_channel_list(self, channels, nopresence=False): - channel = '' - first = True - with self._channel_list_lock: - for ch in channels: - if nopresence is True and ch.find("-pnpres") >= 0: - continue - if not channels[ch]['subscribed']: - continue - if not first: - channel += ',' - else: - first = False - channel += ch - return channel - - def get_channel_group_list(self, channel_groups, nopresence=False): - channel_group = '' - first = True - with self._channel_group_list_lock: - for ch in channel_groups: - if nopresence is True and ch.find("-pnpres") >= 0: - continue - if not channel_groups[ch]['subscribed']: - continue - if not first: - channel_group += ',' - else: - first = False - channel_group += ch - return channel_group - - def get_channel_array(self, nopresence=False): - """Get List of currently subscribed channels - - Returns: - Returns a list containing names of channels subscribed - - Sample return value: - ["a","b","c] - """ - channels = self.subscriptions - channel = [] - with self._channel_list_lock: - for ch in channels: - if nopresence is True and ch.find("-pnpres") >= 0: - continue - if not channels[ch]['subscribed']: - continue - channel.append(ch) - return channel - - def get_channel_group_array(self, nopresence=False): - """Get List of currently subscribed channel groups - - Returns: - Returns a list containing names of channel groups subscribed - - Sample return value: - ["a","b","c] - """ - channel_groups = self.subscription_groups - channel_group = [] - with self._channel_group_list_lock: - for ch in channel_groups: - if nopresence is True and ch.find("-pnpres") >= 0: - continue - if not channel_groups[ch]['subscribed']: - continue - channel_group.append(ch) - return channel_group - - def each(l, func): - if func is None: - return - for i in l: - func(i) - - def restart_heartbeat(self): - self.stop_heartbeat() - self.start_heartbeat() - - def stop_heartbeat(self): - self.abort_heartbeat() - self.heartbeat_running = False - self.heartbeat_stop_flag = False - - def start_heartbeat(self): - if self.heartbeat_running is True: - return - self._presence_heartbeat() - - def _presence_heartbeat(self): - if (self.heartbeat_interval is None or self.heartbeat_interval > 500 or - self.heartbeat_interval < 1): - self.heartbeat_stop_flag = True - - if (len(self.get_channel_list(self.subscriptions, True)) == 0 and - len(self.get_channel_group_list(self.subscription_groups, True)) == 0): - self.heartbeat_stop_flag = True - - if self.heartbeat_stop_flag is True: - self.heartbeat_running = False - self.heartbeat_stop_flag = False - return - - def _callback(resp): - if self.heartbeat_callback is not None: - self.heartbeat_callback(resp) - self.abort_heartbeat = self.timeout( - self.heartbeat_interval, self._presence_heartbeat) - - def _error(resp): - if self.heartbeat_error is not None: - self.heartbeat_error(resp) - self.abort_heartbeat = self.timeout( - self.heartbeat_interval, self._presence_heartbeat) - - self.heartbeat_running = True - self.presence_heartbeat(_callback, _error) - - def set_heartbeat(self, heartbeat, callback=None, error=None): - self.heartbeat = heartbeat - self.heartbeat_interval = (self.heartbeat / 2) - 1 - if self.heartbeat == 2: - self.heartbeat_interval = 1 - self.restart_heartbeat() - with self._tt_lock: - self.last_timetoken = self.timetoken if self.timetoken != 0 \ - else self.last_timetoken - self.timetoken = 0 - self._connect() - self.heartbeat_callback = callback - self.heartbeat_error = error - - def get_heartbeat(self): - return self.heartbeat - - def set_heartbeat_interval(self, heartbeat_interval): - self.heartbeat_interval = heartbeat_interval - self.start_heartbeat() - - def get_heartbeat_interval(self): - return self.heartbeat_interval - - def presence_heartbeat(self, callback=None, error=None): - - data = {'auth': self.auth_key, 'pnsdk': self.pnsdk, - 'uuid': self.uuid} - - st = json.dumps(self.STATE) - - if len(st) > 2: - data['state'] = st - - channels = self.get_channel_list(self.subscriptions, True) - channel_groups = self.get_channel_group_list( - self.subscription_groups, True) - - if channels is None: - channels = ',' - - if channel_groups is not None and len(channel_groups) > 0: - data['channel-group'] = channel_groups - - if self.heartbeat > 0 and self.heartbeat < 320: - data['heartbeat'] = self.heartbeat - - ## Send Heartbeat - return self._request({"urlcomponents": [ - 'v2', 'presence', 'sub-key', - self.subscribe_key, - 'channel', - channels, - 'heartbeat' - ], 'urlparams': data}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - - def subscribe(self, channels, callback, state=None, error=None, - connect=None, disconnect=None, reconnect=None, - presence=None, sync=False): - """Subscribe to data on a channel. - - This function causes the client to create an open TCP socket to the - PubNub Real-Time Network and begin listening for messages on a - specified channel. To subscribe to a channel the client must send - the appropriate subscribe_key at initialization. - - Only works in async mode - - Args: - channel: (string/list) - Specifies the channel to subscribe to. It is possible - to specify multiple channels as a comma separated list - or array. - - callback: (function) - This callback is called on receiving a message from - the channel. - - state: (dict) - State to be set. - - error: (function) (optional) - This callback is called on an error event - - connect: (function) (optional) - This callback is called on a successful connection to - the PubNub cloud - - disconnect: (function) (optional) - This callback is called on client disconnect from the - PubNub cloud - - reconnect: (function) (optional) - This callback is called on successfully re-connecting - to the PubNub cloud - - Returns: - None - """ - - return self._subscribe( - channels=channels, callback=callback, state=state, error=error, - connect=connect, disconnect=disconnect, reconnect=reconnect, - presence=presence) - - def subscribe_group(self, channel_groups, callback, error=None, - connect=None, disconnect=None, reconnect=None, - sync=False): - """Subscribe to data on a channel group. - - This function causes the client to create an open TCP socket to the - PubNub Real-Time Network and begin listening for messages on a - specified channel. To subscribe to a channel group the client must - send the appropriate subscribe_key at initialization. - - Only works in async mode - - Args: - channel_groups: (string/list) - Specifies the channel groups to subscribe to. It is - possible to specify multiple channel groups as a comma - separated list or array. - - callback: (function) - This callback is called on receiving a message from - the channel. - - error: (function) (optional) - This callback is called on an error event - - connect: (function) (optional) - This callback is called on a successful connection to - the PubNub cloud - - disconnect: (function) (optional) - This callback is called on client disconnect from the - PubNub cloud - - reconnect: (function) (optional) - This callback is called on successfully re-connecting - to the PubNub cloud - - Returns: - None - """ - - return self._subscribe( - channel_groups=channel_groups, callback=callback, error=error, - connect=connect, disconnect=disconnect, reconnect=reconnect) - - def _subscribe( - self, channels=None, channel_groups=None, state=None, callback=None, - error=None, connect=None, disconnect=None, reconnect=None, - presence=None): - - with self._tt_lock: - self.last_timetoken = self.timetoken if self.timetoken != 0 \ - else self.last_timetoken - self.timetoken = 0 - - def _invoke(func, msg=None, channel=None, real_channel=None): - if func is not None: - if (msg is not None and channel is not None and - real_channel is not None): - try: - func(get_data_for_user(msg), channel, real_channel) - except: - func(get_data_for_user(msg), channel) - elif msg is not None and channel is not None: - func(get_data_for_user(msg), channel) - elif msg is not None: - func(get_data_for_user(msg)) - else: - func() - - def _invoke_connect(): - if self._channel_list_lock: - with self._channel_list_lock: - x = copy.copy(self.subscriptions) - for ch in x: - chobj = x[ch] - if chobj['connected'] is False: - chobj['connected'] = True - chobj['disconnected'] = False - _invoke(chobj['connect'], chobj['name']) - else: - if chobj['disconnected'] is True: - chobj['disconnected'] = False - _invoke(chobj['reconnect'], chobj['name']) - - if self._channel_group_list_lock: - with self._channel_group_list_lock: - for ch in self.subscription_groups: - chobj = self.subscription_groups[ch] - if chobj['connected'] is False: - chobj['connected'] = True - chobj['disconnected'] = False - _invoke(chobj['connect'], chobj['name']) - else: - if chobj['disconnected'] is True: - chobj['disconnected'] = False - _invoke(chobj['reconnect'], chobj['name']) - - def _invoke_disconnect(): - if self._channel_list_lock: - with self._channel_list_lock: - for ch in self.subscriptions: - chobj = self.subscriptions[ch] - if chobj['connected'] is True: - if chobj['disconnected'] is False: - chobj['disconnected'] = True - _invoke(chobj['disconnect'], chobj['name']) - if self._channel_group_list_lock: - with self._channel_group_list_lock: - for ch in self.subscription_groups: - chobj = self.subscription_groups[ch] - if chobj['connected'] is True: - if chobj['disconnected'] is False: - chobj['disconnected'] = True - _invoke(chobj['disconnect'], chobj['name']) - - def _invoke_error(channel_list=None, error=None): - if channel_list is None: - for ch in self.subscriptions: - chobj = self.subscriptions[ch] - try: - _invoke(chobj['error'], error, ch) - except TypeError: - _invoke(chobj['error'], error) - else: - for ch in channel_list: - chobj = self.subscriptions[ch] - try: - _invoke(chobj['error'], error, ch) - except TypeError: - _invoke(chobj['error'], error) - - def _get_channel(): - for ch in self.subscriptions: - chobj = self.subscriptions[ch] - if chobj['subscribed'] is True: - return chobj - - if channels is not None: - channels = channels if isinstance( - channels, list) else channels.split(",") - for channel in channels: - ## New Channel? - if len(channel) > 0 and \ - (channel not in self.subscriptions or - self.subscriptions[channel]['subscribed'] is False): - with self._channel_list_lock: - self.subscriptions[channel] = { - 'name': channel, - 'first': False, - 'connected': False, - 'disconnected': True, - 'subscribed': True, - 'callback': callback, - 'connect': connect, - 'disconnect': disconnect, - 'reconnect': reconnect, - 'error': error, - 'presence': presence - } - if state is not None: - if channel in self.STATE: - self.STATE[channel] = state[channel] - else: - self.STATE[channel] = state - - if channel_groups is not None: - channel_groups = channel_groups if isinstance( - channel_groups, list) else channel_groups.split(",") - - for channel_group in channel_groups: - ## New Channel? - if (len(channel_group) > 0 and - (channel_group not in self.subscription_groups or - self.subscription_groups[channel_group]['subscribed'] - is False)): - with self._channel_group_list_lock: - self.subscription_groups[channel_group] = { - 'name': channel_group, - 'first': False, - 'connected': False, - 'disconnected': True, - 'subscribed': True, - 'callback': callback, - 'connect': connect, - 'disconnect': disconnect, - 'reconnect': reconnect, - 'error': error, - 'presence': presence - } - - ''' - ## return if already connected to channel - if channel in self.subscriptions and \ - 'connected' in self.subscriptions[channel] and \ - self.subscriptions[channel]['connected'] is True: - _invoke(error, "Already Connected") - return - ''' - - self.restart_heartbeat() - - ## SUBSCRIPTION RECURSION - def _connect(): - - self._reset_offline() - - def error_callback(response): - ## ERROR ? - if not response or \ - ('message' in response and - response['message'] == 'Forbidden'): - _invoke_error(channel_list=response['payload'][ - 'channels'], error=response['message']) - self.timeout(1, _connect) - return - if 'message' in response: - _invoke_error(error=response['message']) - else: - _invoke_disconnect() - self.timetoken = 0 - self.timeout(1, _connect) - - def sub_callback(response): - ## ERROR ? - if not response or \ - ('message' in response and - response['message'] == 'Forbidden'): - _invoke_error(channel_list=response['payload'][ - 'channels'], error=response['message']) - _connect() - return - - _invoke_connect() - - with self._tt_lock: - self.timetoken = \ - self.last_timetoken if self.timetoken == 0 and \ - self.last_timetoken != 0 else response[1] - - if len(response) > 3: - channel_list = response[2].split(',') - channel_list_2 = response[3].split(',') - response_list = response[0] - for ch in enumerate(channel_list): - if (ch[1] in self.subscription_groups or - ch[1] in self.subscriptions): - try: - chobj = self.subscription_groups[ch[1]] - except KeyError: - chobj = self.subscriptions[ch[1]] - - if ('-pnpres' in channel_list_2[ch[0]]): - cb = chobj['presence'] - else: - cb = chobj['callback'] - _invoke(cb, - self.decrypt(response_list[ch[0]]), - chobj['name'].split('-pnpres')[0], - channel_list_2[ch[0]].split - ('-pnpres')[0]) - elif len(response) > 2: - channel_list = response[2].split(',') - response_list = response[0] - for ch in enumerate(channel_list): - if ch[1] in self.subscriptions: - chobj = self.subscriptions[ch[1]] - _invoke(chobj['callback'], - self.decrypt(response_list[ch[0]]), - chobj['name'].split('-pnpres')[0]) - else: - response_list = response[0] - chobj = _get_channel() - for r in response_list: - if chobj: - _invoke(chobj['callback'], self.decrypt(r), - chobj['name'].split('-pnpres')[0]) - - _connect() - - channel_list = self.get_channel_list(self.subscriptions) - channel_group_list = self.get_channel_group_list( - self.subscription_groups) - - if len(channel_list) <= 0 and len(channel_group_list) <= 0: - return - - if len(channel_list) <= 0: - channel_list = ',' - - data = {"uuid": self.uuid, "auth": self.auth_key, - 'pnsdk': self.pnsdk, 'channel-group': channel_group_list} - - st = json.dumps(self.STATE) - - if len(st) > 2: - data['state'] = quote(st, safe="") - - if self.heartbeat > 0: - data["heartbeat"] = self.heartbeat - - ## CONNECT TO PUBNUB SUBSCRIBE SERVERS - #try: - self.SUB_RECEIVER = self._request({"urlcomponents": [ - 'subscribe', - self.subscribe_key, - channel_list, - '0', - str(self.timetoken) - ], "urlparams": data}, - sub_callback, - error_callback, - single=True, timeout=320) - ''' - except Exception as e: - self.timeout(1, _connect) - return - ''' - - self._connect = _connect - - ## BEGIN SUBSCRIPTION (LISTEN FOR MESSAGES) - _connect() - - def _reset_offline(self): - if self.SUB_RECEIVER is not None: - self.SUB_RECEIVER() - self.SUB_RECEIVER = None - - def CONNECT(self): - self._reset_offline() - self._connect() - - def unsubscribe(self, channel): - """Unsubscribe from channel . - Only works in async mode - - Args: - channel: Channel name ( string ) - """ - if channel in self.subscriptions is False: - return False - - ## DISCONNECT - with self._channel_list_lock: - if channel in self.subscriptions: - self.subscriptions[channel]['connected'] = 0 - self.subscriptions[channel]['subscribed'] = False - self.subscriptions[channel]['timetoken'] = 0 - self.subscriptions[channel]['first'] = False - self.leave_channel(channel=channel) - - # remove channel from STATE - self.STATE.pop(channel, None) - - self.CONNECT() - - def unsubscribe_group(self, channel_group): - """Unsubscribe from channel group. - Only works in async mode - - Args: - channel_group: Channel group name ( string ) - """ - if channel_group in self.subscription_groups is False: - return False - - ## DISCONNECT - with self._channel_group_list_lock: - if channel_group in self.subscription_groups: - self.subscription_groups[channel_group]['connected'] = 0 - self.subscription_groups[channel_group]['subscribed'] = False - self.subscription_groups[channel_group]['timetoken'] = 0 - self.subscription_groups[channel_group]['first'] = False - self.leave_group(channel_group=channel_group) - self.CONNECT() - - -class PubnubCore(PubnubCoreAsync): - def __init__( - self, - publish_key, - subscribe_key, - secret_key=None, - cipher_key=None, - auth_key=None, - ssl_on=False, - origin='pubsub.pubnub.com', - uuid=None, - _tt_lock=None, - _channel_list_lock=None, - _channel_group_list_lock=None - - ): - super(PubnubCore, self).__init__( - publish_key=publish_key, - subscribe_key=subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - auth_key=auth_key, - ssl_on=ssl_on, - origin=origin, - uuid=uuid, - _tt_lock=_tt_lock, - _channel_list_lock=_channel_list_lock, - _channel_group_list_lock=_channel_group_list_lock - ) - - self.subscriptions = {} - self.timetoken = 0 - self.accept_encoding = 'gzip' - - -class Timer: - def __init__(self, timeout, func, daemon=False, *argv): - self.timeout = timeout - self.func = func - self.argv = argv - self.stop = False - self.thread = None - self.daemon = daemon - - def cancel(self): - self.stop = True - self.func = None - - def run(self): - time.sleep(self.timeout) - if self.func is not None: - if self.argv is None and len(self.argv) == 0: - self.func() - else: - self.func(*(self.argv)) - - def start(self): - self.thread = threading.Thread(target=self.run) - self.thread.daemon = self.daemon - self.thread.start() - - -class HTTPClient: - def __init__(self, pubnub, url, urllib_func=None, - callback=None, error=None, id=None, timeout=15): - self.url = url - self.id = id - self.callback = callback - self.error = error - self.stop = False - self._urllib_func = urllib_func - self.timeout = timeout - self.pubnub = pubnub - - def cancel(self): - self.stop = True - self.callback = None - self.error = None - - def run(self): - - def _invoke(func, data): - if func is not None: - func(get_data_for_user(data)) - - if self._urllib_func is None: - return - - resp = self._urllib_func(self.url, timeout=self.timeout) - data = resp[0] - code = resp[1] - - if self.stop is True: - return - if self.callback is None: - with self.pubnub.latest_sub_callback_lock: - if self.pubnub.latest_sub_callback['id'] != self.id: - return - else: - if (self.pubnub.latest_sub_callback['callback'] - is not None): - self.pubnub.latest_sub_callback['id'] = 0 - try: - data = json.loads(data) - except ValueError: - _invoke(self.pubnub.latest_sub_callback['error'], - {'error': 'json decoding error'}) - return - if code != 200: - _invoke(self.pubnub.latest_sub_callback[ - 'error'], data) - else: - _invoke(self.pubnub.latest_sub_callback[ - 'callback'], data) - else: - try: - data = json.loads(data) - except ValueError: - _invoke(self.error, {'error': 'json decoding error'}) - return - - if code != 200: - _invoke(self.error, data) - else: - _invoke(self.callback, data) - - -def _urllib_request_2(url, timeout=15): - try: - resp = urllib2.urlopen(url, timeout=timeout) - except urllib2.HTTPError as http_error: - resp = http_error - except urllib2.URLError as error: - msg = {"message": str(error.reason)} - return (json.dumps(msg), 0) - - return (resp.read(), resp.code) - - -class PubnubHTTPAdapter(HTTPAdapter): - def init_poolmanager(self, *args, **kwargs): - kwargs.setdefault('socket_options', default_socket_options) - - super(PubnubHTTPAdapter, self).init_poolmanager(*args, **kwargs) - -s = requests.Session() -#s.mount('http://', PubnubHTTPAdapter(max_retries=1)) -#s.mount('https://', PubnubHTTPAdapter(max_retries=1)) -#s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) -#s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) - - -def _requests_request(url, timeout=15): - try: - resp = s.get(url, timeout=timeout) - except requests.exceptions.HTTPError as http_error: - resp = http_error - except requests.exceptions.ConnectionError as error: - msg = str(error) - return (json.dumps(msg), 0) - except requests.exceptions.Timeout as error: - msg = str(error) - return (json.dumps(msg), 0) - return (resp.text, resp.status_code) - - -def _urllib_request_3(url, timeout=15): - try: - resp = urllib.request.urlopen(url, timeout=timeout) - except (urllib.request.HTTPError, urllib.request.URLError) as http_error: - resp = http_error - r = resp.read().decode("utf-8") - return (r, resp.code) - -_urllib_request = None - - -# Pubnub - -class Pubnub(PubnubCore): - def __init__( - self, - publish_key, - subscribe_key, - secret_key=None, - cipher_key=None, - auth_key=None, - ssl_on=False, - origin='pubsub.pubnub.com', - uuid=None, - pooling=True, - daemon=False, - pres_uuid=None, - azure=False - ): - super(Pubnub, self).__init__( - publish_key=publish_key, - subscribe_key=subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - auth_key=auth_key, - ssl_on=ssl_on, - origin=origin, - uuid=uuid or pres_uuid, - _tt_lock=threading.RLock(), - _channel_list_lock=threading.RLock(), - _channel_group_list_lock=threading.RLock() - ) - global _urllib_request - if self.python_version == 2: - _urllib_request = _urllib_request_2 - else: - _urllib_request = _urllib_request_3 - - if pooling is True: - _urllib_request = _requests_request - - self.latest_sub_callback_lock = threading.RLock() - self.latest_sub_callback = {'id': None, 'callback': None} - self.pnsdk = 'PubNub-Python' + '/' + self.version - self.daemon = daemon - - if azure is False: - s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) - s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) - else: - s.mount('http://', PubnubHTTPAdapter(max_retries=1)) - s.mount('https://', PubnubHTTPAdapter(max_retries=1)) - - def timeout(self, interval, func1, *argv): - timer = Timer(interval, func1, False, *argv) - timer.start() - - return timer.cancel - - def _request_async(self, url, callback=None, error=None, single=False, - timeout=15): - global _urllib_request - - if single is True: - id = time.time() - client = HTTPClient(self, url=url, urllib_func=_urllib_request, - callback=None, error=None, id=id, - timeout=timeout) - with self.latest_sub_callback_lock: - self.latest_sub_callback['id'] = id - self.latest_sub_callback['callback'] = callback - self.latest_sub_callback['error'] = error - else: - client = HTTPClient(self, url=url, urllib_func=_urllib_request, - callback=callback, error=error, - timeout=timeout) - - thread = threading.Thread(target=client.run) - thread.daemon = self.daemon - thread.start() - - def abort(): - client.cancel() - return abort - - def _request_sync(self, url, timeout=15): - global _urllib_request - - ## Send Request Expecting JSONP Response - response = _urllib_request(url, timeout=timeout) - try: - resp_json = json.loads(response[0]) - except ValueError: - return [0, "JSON Error"] - - if (response[1] != 200 and 'message' in resp_json and - 'payload' in resp_json): - return {'message': resp_json['message'], - 'payload': resp_json['payload']} - - if response[1] == 0: - return [0, resp_json] - - return resp_json - - def _request(self, request, callback=None, error=None, single=False, - timeout=15, encoder_map=None): - - url = self.getUrl(request, encoder_map) - - if callback is None: - return get_data_for_user(self._request_sync(url, - timeout=timeout)) - else: - return self._request_async(url, callback, error, - single=single, timeout=timeout) - -# Pubnub Twisted - - -class PubnubTwisted(PubnubCoreAsync): - - def start(self): - reactor.run() - - def stop(self): - reactor.stop() - - def timeout(self, delay, callback, *args): - def cb(): - if callback is not None: - callback(*args) - - timeout = reactor.callLater(delay, cb) - - def cancel(): - if timeout.active(): - timeout.cancel() - - return cancel - - def __init__( - self, - publish_key, - subscribe_key, - secret_key=None, - cipher_key=None, - auth_key=None, - ssl_on=False, - origin='pubsub.pubnub.com', - uuid=None - ): - super(PubnubTwisted, self).__init__( - publish_key=publish_key, - subscribe_key=subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - auth_key=auth_key, - ssl_on=ssl_on, - origin=origin, - uuid=uuid - ) - self.headers = {} - self.headers['User-Agent'] = ['Python-Twisted'] - self.headers['V'] = [self.version] - self.pnsdk = 'PubNub-Python-' + 'Twisted' + '/' + self.version - - def _request(self, request, callback=None, error=None, - single=False, timeout=15, encoder_map=None): - global pnconn_pool - - def _invoke(func, data): - if func is not None: - func(get_data_for_user(data)) - - ## Build URL - - url = self.getUrl(request, encoder_map) - - agent = ContentDecoderAgent(RedirectAgent(Agent( - reactor, - contextFactory=WebClientContextFactory(), - pool=self.ssl and None or pnconn_pool - )), [('gzip', GzipDecoder)]) - - try: - request = agent.request( - 'GET', url, Headers(self.headers), None) - except TypeError: - request = agent.request( - 'GET', url.encode(), Headers(self.headers), None) - - if single is True: - id = time.time() - self.id = id - - def received(response): - if not isinstance(response, twisted.web._newclient.Response) and \ - not isinstance(response, twisted.web.client.GzipDecoder): - if response is None: - return - message = "not found" - try: - message = response.getErrorMessage() - except: - pass - _invoke(error, {"message": message}) - return - - finished = Deferred() - if response.code in [401, 403]: - response.deliverBody(PubNubPamResponse(finished)) - else: - response.deliverBody(PubNubResponse(finished)) - - return finished - - def complete(data): - if data is None: - return - - if single is True: - if id != self.id: - return None - try: - data = json.loads(data) - except ValueError: - try: - data = json.loads(data.decode("utf-8")) - except ValueError: - _invoke(error, {'error': 'json decode error'}) - - if 'error' in data and 'status' in data and 'status' != 200: - _invoke(error, data) - else: - _invoke(callback, data) - - def abort(): - pass - - request.addErrback(received) - request.addCallback(received) - request.addCallback(complete) - - return abort - - -# PubnubTornado -class PubnubTornado(PubnubCoreAsync): - - def stop(self): - ioloop.stop() - - def start(self): - ioloop.start() - - def timeout(self, delay, callback, *args): - handle = None - - def cancel(): - ioloop.remove_timeout(handle) - - def cb(): - if callback is not None: - callback(*args) - - handle = ioloop.add_timeout(time.time() + float(delay), cb) - - return cancel - - def __init__( - self, - publish_key, - subscribe_key, - secret_key=False, - cipher_key=False, - auth_key=False, - ssl_on=False, - origin='pubsub.pubnub.com', - uuid=None - ): - super(PubnubTornado, self).__init__( - publish_key=publish_key, - subscribe_key=subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - auth_key=auth_key, - ssl_on=ssl_on, - origin=origin, - uuid=uuid - ) - self.headers = {} - self.headers['User-Agent'] = 'Python-Tornado' - self.headers['Accept-Encoding'] = self.accept_encoding - self.headers['V'] = self.version - self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) - self.id = None - self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.version - - def _request(self, request, callback=None, error=None, - single=False, timeout=15, connect_timeout=5, - encoder_map=None): - - def _invoke(func, data): - if func is not None: - func(get_data_for_user(data)) - - url = self.getUrl(request, encoder_map) - request = tornado.httpclient.HTTPRequest( - url, 'GET', - self.headers, - connect_timeout=connect_timeout, - request_timeout=timeout) - if single is True: - id = time.time() - self.id = id - - def responseCallback(response): - if single is True: - if not id == self.id: - return None - - body = response._get_body() - - if body is None: - return - - def handle_exc(*args): - return True - if response.error is not None: - with ExceptionStackContext(handle_exc): - if response.code in [403, 401]: - response.rethrow() - else: - _invoke(error, {"message": response.reason}) - return - - try: - data = json.loads(body) - except TypeError: - try: - data = json.loads(body.decode("utf-8")) - except ValueError: - _invoke(error, {'error': 'json decode error'}) - - if 'error' in data and 'status' in data and 'status' != 200: - _invoke(error, data) - else: - _invoke(callback, data) - - self.http.fetch( - request=request, - callback=responseCallback - ) - - def abort(): - pass - - return abort diff --git a/python-tornado/LICENSE b/python-tornado/LICENSE deleted file mode 100644 index 3efa3922..00000000 --- a/python-tornado/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks -Copyright (c) 2013 PubNub Inc. -http://www.pubnub.com/ -http://www.pubnub.com/terms - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks -Copyright (c) 2013 PubNub Inc. -http://www.pubnub.com/ -http://www.pubnub.com/terms diff --git a/python-tornado/README.md b/python-tornado/README.md deleted file mode 100644 index eaa2fe02..00000000 --- a/python-tornado/README.md +++ /dev/null @@ -1,137 +0,0 @@ -## Contact support@pubnub.com for all questions - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Tornado Client - -## IO Event Loop -Be sure to eventually start the event loop or PubNub won't run! - -``` -pubnub.start() -``` - -#### Import -``` -from pubnub import PubnubTornado as Pubnub -``` - -#### Init -``` -pubnub = Pubnub(publish_key="demo", subscribe_key="demo", ssl_on=False) -``` - -#### Publish Example -``` -channel = 'hello_world' -message = 'Hello World !!!' - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.publish(channel, message, callback=callback, error=callback) -``` - -#### Subscribe Example -``` -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### History Example -``` -def callback(message): - print(message) - -pubnub.history(channel, count=2, callback=callback, error=callback) -``` - -#### Here Now Example -``` -def callback(message): - print(message) - -pubnub.here_now(channel, callback=callback, error=callback) -``` - -#### Presence Example -``` -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - -pubnub.presence(channel, callback=callback, error=callback) -``` - -#### Unsubscribe Example -``` -pubnub.unsubscribe(channel='hello_world') -``` - -#### Grant Example -``` -authkey = "abcd" - -def callback(message): - print(message) - -pubnub.grant(channel, authkey, True, True, callback=callback, error=callback) - -``` - -#### Audit Example -``` -authkey = "abcd" - -def callback(message): - print(message) - -pubnub.audit(channel, authkey, callback=callback, error=callback) -``` - -#### Revoke Example -``` -authkey = "abcd" - -def callback(message): - print(message) - -pubnub.revoke(channel, authkey, callback=callback, error=callback) -``` - - -#### IO Event Loop start -``` -pubnub.start() -``` - -## Contact support@pubnub.com for all questions diff --git a/python-tornado/examples/audit.py b/python-tornado/examples/audit.py deleted file mode 100755 index 2e7fa5b2..00000000 --- a/python-tornado/examples/audit.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.audit(channel, auth_key=authkey, callback=callback, error=callback) - -pubnub.start() diff --git a/python-tornado/examples/grant.py b/python-tornado/examples/grant.py deleted file mode 100755 index 52c7acd4..00000000 --- a/python-tornado/examples/grant.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.grant(channel, authkey, True, True, callback=callback, error=callback) - -pubnub.start() diff --git a/python-tornado/examples/here-now.py b/python-tornado/examples/here-now.py deleted file mode 100755 index 9d3e0288..00000000 --- a/python-tornado/examples/here-now.py +++ /dev/null @@ -1,36 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' - - -# Asynchronous usage - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.here_now(channel, callback=callback, error=callback) - -pubnub.start() diff --git a/python-tornado/examples/history.py b/python-tornado/examples/history.py deleted file mode 100755 index 3c7bbe4f..00000000 --- a/python-tornado/examples/history.py +++ /dev/null @@ -1,37 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'a' - - -# Asynchronous usage - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.history(channel, count=2, callback=callback, error=callback) - -pubnub.start() diff --git a/python-tornado/examples/presence_group.py b/python-tornado/examples/presence_group.py deleted file mode 100755 index 2384b500..00000000 --- a/python-tornado/examples/presence_group.py +++ /dev/null @@ -1,67 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'abcd' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - -channel = 'ab' - - -# Asynchronous usage - -def callback_abc(message, channel, real_channel): - print(str(message) + ' , ' + channel + ', ' + real_channel) - # pubnub.unsubscribe_group(channel_group='abc') - # pubnub.stop() - - -def callback_d(message, channel): - print(str(message) + ' , ' + channel) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect_abc(message): - print("CONNECTED " + str(message)) - - -def connect_d(message): - print("CONNECTED " + str(message)) - pubnub.unsubscribe(channel='d') - - -def reconnect(message): - print("RECONNECTED " + str(message)) - - -def disconnect(message): - print("DISCONNECTED " + str(message)) - - -print(pubnub.channel_group_add_channel(channel_group='abc', channel="bn")) - -pubnub.presence_group(channel_group='abc', callback=callback_abc, error=error) - -pubnub.presence(channel='d', callback=callback_d, error=error) - -pubnub.start() diff --git a/python-tornado/examples/publish.py b/python-tornado/examples/publish.py deleted file mode 100755 index 5cc87575..00000000 --- a/python-tornado/examples/publish.py +++ /dev/null @@ -1,36 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -message = 'Hello World !!!' - - -# Asynchronous usage -def callback(message): - print(message) - pubnub.stop() - - -pubnub.publish(channel, message, callback=callback, error=callback) - -pubnub.start() diff --git a/python-tornado/examples/revoke.py b/python-tornado/examples/revoke.py deleted file mode 100755 index 1231782b..00000000 --- a/python-tornado/examples/revoke.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.revoke(channel, authkey, callback=callback, error=callback) - -pubnub.start() diff --git a/python-tornado/examples/subscribe.py b/python-tornado/examples/subscribe.py deleted file mode 100755 index 597db110..00000000 --- a/python-tornado/examples/subscribe.py +++ /dev/null @@ -1,52 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - -channel = 'a' - - -# Asynchronous usage -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) - -pubnub.start() diff --git a/python-tornado/examples/subscribe_group.py b/python-tornado/examples/subscribe_group.py deleted file mode 100755 index 4f923535..00000000 --- a/python-tornado/examples/subscribe_group.py +++ /dev/null @@ -1,69 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTornado as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'abcd' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - -channel = 'ab' - - -# Asynchronous usage - -def callback_abc(message, channel, real_channel): - print(str(message) + ' , ' + channel + ', ' + real_channel) - pubnub.unsubscribe_group(channel_group='abc') - pubnub.stop() - - -def callback_d(message, channel): - print(str(message) + ' , ' + channel) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect_abc(message): - print("CONNECTED " + str(message)) - - -def connect_d(message): - print("CONNECTED " + str(message)) - pubnub.unsubscribe(channel='d') - - -def reconnect(message): - print("RECONNECTED " + str(message)) - - -def disconnect(message): - print("DISCONNECTED " + str(message)) - - -print(pubnub.channel_group_add_channel(channel_group='abc', channel="b")) - -pubnub.subscribe_group(channel_groups='abc', callback=callback_abc, error=error, - connect=connect_abc, reconnect=reconnect, disconnect=disconnect) - -pubnub.subscribe(channels='d', callback=callback_d, error=error, - connect=connect_d, reconnect=reconnect, disconnect=disconnect) - -pubnub.start() diff --git a/python-tornado/migration.md b/python-tornado/migration.md deleted file mode 100644 index 6a1abf38..00000000 --- a/python-tornado/migration.md +++ /dev/null @@ -1,205 +0,0 @@ -## Contact support@pubnub.com for all questions - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Tornado Migration - -#### Import - -``` -# Pre 3.5: -from pubnub import Pubnub - -# New in 3.5+ -from pubnub import PubnubTornado as Pubnub - -``` - - -#### Init - -``` - -# Pre 3.5: -pubnub = Pubnub( - "demo", ## PUBLISH_KEY - "demo", ## SUBSCRIBE_KEY - False ## SSL_ON? -) - -# New in 3.5+ -pubnub = Pubnub(publish_key="demo", subscribe_key="demo", ssl_on=False) - -``` - -#### PUBLISH - -``` -channel = 'hello_world' -message = 'Hello World !!!' - -# Pre 3.5: -def callback(messages): - print(messages) - -pubnub.publish( { - 'channel' : channel, - 'message' : message, - 'callback' : callback -}) - -# New in 3.5+ - -def callback(message): - print(message) - -pubnub.publish(channel, message, callback=callback, error=callback) - -``` - - -#### SUBSCRIBE - -``` - -# Listen for Messages - -channel = 'hello_world' - -# Pre 3.5: -def connected() : - print('CONNECTED') - -def message_received(message): - print(message) - -pubnub.subscribe({ - 'channel' : channel, - 'connect' : connected, - 'callback' : message_received -}) - -# New in 3.5+ - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### Unsubscribe -Once subscribed, you can easily, gracefully, unsubscribe: - -``` -# Pre 3.5: -pubnub.unsubscribe({ - 'channel' : 'hello_world' -}) - -# New in 3.5+ - -pubnub.unsubscribe(channel='hello_world') -``` - -#### PRESENCE - -``` - -# Pre 3.5: -# - -# New in 3.5+ - -# Listen for Presence Event Messages - -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - -pubnub.presence(channel, callback=callback, error=callback) -``` - -#### HERE_NOW - -``` - -channel = 'hello_world' - -# Pre 3.5: -def callback(messages): - print(messages) - -pubnub.here_now( { - 'channel' : channel, - 'callback' : callback -}) - - -# New in 3.5+ - -# Get info on who is here right now! - - -def callback(message): - print(message) - -pubnub.here_now(channel, callback=callback, error=callback) -``` - -#### HISTORY - -``` -channel = 'hello_world' - -# Pre 3.5: -def history_complete(messages): - print(messages) - -pubnub.history( { - 'channel' : channel, - 'limit' : 2, - 'callback' : history_complete -}) - - -# New in 3.5+ - -def callback(message): - print(message) - -pubnub.history(channel, count=2, callback=callback, error=callback) -``` - -#### IO Event Loop - -``` - -# Pre 3.5: -tornado.ioloop.IOLoop.instance().start() - -# New in 3.5+ -pubnub.start() -``` -## Contact support@pubnub.com for all questions diff --git a/python-tornado/tests/test_grant_async.py b/python-tornado/tests/test_grant_async.py deleted file mode 100755 index bb6121c2..00000000 --- a/python-tornado/tests/test_grant_async.py +++ /dev/null @@ -1,354 +0,0 @@ -import time - -from pubnub import PubnubTornado as Pubnub - -subkey = "sub-c-9aeec0d4-cdf4-11e5-bcee-0619f8945a4f" -pubkey = "pub-c-b3fdf8fc-4516-4ab2-8836-6fb22ba7870d" -secretkey = "sec-c-ZDQwNTUwMDctZDViYi00MzhlLTg2NTctYjViZDcwNTA5Zjhj" -pubnub = Pubnub(pubkey, subkey) -pubnub_pam = Pubnub(pubkey, subkey, secretkey) - - -# Grant permission read true, write true, on channel ( Async Mode ) -def test_1(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {'abcd': {'r': 1, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, write=True, ttl=1, callback=_callback, error=_error) - - -# Grant permission read false, write false, on channel ( Async Mode ) -def test_2(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {'abcd': {'r': 0, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1} - } - - def _error(response): - print("error") - print(response) - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, write=False, ttl=1, callback=_callback, error=_error) - - -# Grant permission read True, write false, on channel ( Async Mode ) -def test_3(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {'abcd': {'r': 1, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, write=False, ttl=1, callback=_callback, error=_error) - - -# Grant permission read False, write True, on channel ( Async Mode ) -def test_4(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {'abcd': {'r': 0, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, write=True, ttl=1, callback=_callback, error=_error) - - -# Grant permission read False, write True, on channel ( Async Mode ), TTL 10 -def test_5(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {'abcd': {'r': 0, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 10} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, write=True, ttl=10, callback=_callback, error=_error) - - -# Grant permission read False, write True, without channel ( Async Mode ), TTL 10 -def test_6(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'r': 0, 'w': 1, 'm': 0, - 'subscribe_key': subkey, - 'level': 'subkey', 'ttl': 10} - } - - def _error(response): - print(response) - assert False - - pubnub_pam.grant(read=False, write=True, ttl=10, callback=_callback, error=_error) - - -# Grant permission read False, write False, without channel ( Async Mode ) -def test_7(): - def _callback(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'r': 0, 'w': 0, 'm': 0, - 'subscribe_key': subkey, - 'level': 'subkey', 'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(read=False, write=False, callback=_callback, error=_error) - - -# Complete flow , try publish on forbidden channel, grant permission to subkey and try again. ( Sync Mode) - -def test_8(): - channel = "test_8-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb2(resp): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {auth_key: {'r': 1, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': channel, 'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _err3(resp): - print(resp) - assert False - - time.sleep(7) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(): - assert False - - pubnub_pam.grant(channel=channel, read=True, write=True, auth_key=auth_key, ttl=10, callback=_cb2, error=_err2) - - -# Complete flow , try publish on forbidden channel, grant permission to authkey and try again. -# then revoke and try again -def test_9(): - channel = "test_9-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb2(resp): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {auth_key: {'r': 1, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': channel, 'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _cb4(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'auths': {auth_key: {'r': 0, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': channel, 'ttl': 1} - } - - def _cb5(resp, ch=None): - print(resp) - assert False - - def _err5(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {'channels': [channel]} - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb5, error=_err5) - - def _err4(resp): - assert False - - pubnub_pam.revoke(channel=channel, auth_key=auth_key, callback=_cb4, error=_err4) - - def _err3(resp): - assert False - - time.sleep(7) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(channel=channel, read=True, write=True, auth_key=auth_key, ttl=10, callback=_cb2, error=_err2) - - -# Complete flow , try publish on forbidden channel, grant permission channel level for subkey and try again. -# then revoke and try again -def test_10(): - channel = "test_10-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub_pam.set_auth_key(auth_key) - - def _cb2(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'channels': {channel: {'r': 1, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'channel', 'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _cb4(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'channels': {channel: {'r': 0, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'channel', 'ttl': 1} - } - - def _cb5(resp, ch=None): - assert False - - def _err5(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {'channels': [channel]} - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb5, error=_err5) - - def _err4(resp): - assert False - - pubnub_pam.revoke(channel=channel, callback=_cb4, error=_err4) - - def _err3(resp): - assert False - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(channel=channel, read=True, write=True, ttl=10, callback=_cb2, error=_err2) - - -# Complete flow , try publish on forbidden channel, grant permission subkey level for subkey and try again. -# then revoke and try again -def test_11(): - channel = "test_11-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb2(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'r': 1, 'w': 1, 'm': 0, - 'subscribe_key': subkey, - 'level': 'subkey', 'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _cb4(resp, ch=None): - assert resp == { - 'message': 'Success', - 'payload': {'r': 0, 'w': 0, 'm': 0, - 'subscribe_key': subkey, - 'level': 'subkey', 'ttl': 1} - } - - def _cb5(resp, ch=None): - assert False - - def _err5(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {'channels': [channel]} - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb5, error=_err5) - - def _err4(resp): - assert False - - pubnub_pam.revoke(callback=_cb4, error=_err4) - - def _err3(resp): - assert False - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(read=True, write=True, ttl=10, callback=_cb2, error=_err2) - - -x = 5 - - -def run_test(t): - global x - x += 5 - i = (x / 5) - 1 - - def _print(): - print('Running test ' + str(i)) - - pubnub.timeout(x, _print) - pubnub.timeout(x + 1, t) - - -def stop(): - pubnub.stop() - - -run_test(test_1) -run_test(test_2) -run_test(test_3) -run_test(test_4) -run_test(test_5) -run_test(test_6) -run_test(test_7) -run_test(test_8) -run_test(test_9) -run_test(test_10) -run_test(test_11) -run_test(stop) - -pubnub_pam.start() diff --git a/python-tornado/tests/test_publish_async.py b/python-tornado/tests/test_publish_async.py deleted file mode 100755 index b8ddcdce..00000000 --- a/python-tornado/tests/test_publish_async.py +++ /dev/null @@ -1,333 +0,0 @@ -import time -# from twisted.trial import unittest - -from pubnub import PubnubTornado as Pubnub - -pubkey = "pub-c-37d3c709-c35e-487a-8b33-2314d9b62b28" -subkey = "sub-c-cd0b6288-cdf5-11e5-bcee-0619f8945a4f" -pubnub = Pubnub(pubkey, subkey) -pubnub_enc = Pubnub(pubkey, subkey, cipher_key="enigma") - - -# class PublishTests(unittest.TestCase): -def test_1(): - channel = "test_1-" + str(time.time()) - message = "I am a string" - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive array -def test_2(): - channel = "test_2-" + str(time.time()) - message = [1, 2] - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - print(resp) - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive json object -def test_3(): - channel = "test_2-" + str(time.time()) - message = {"a": "b"} - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number -def test_4(): - channel = "test_2-" + str(time.time()) - message = 100 - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number string -def test_5(): - channel = "test_5-" + str(time.time()) - message = "100" - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive string (Encryption enabled) -def test_6(): - channel = "test_6-" + str(time.time()) - message = "I am a string" - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive array (Encryption enabled) -def test_7(): - channel = "test_7-" + str(time.time()) - message = [1, 2] - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive json object (Encryption enabled) -def test_8(): - channel = "test_8-" + str(time.time()) - message = {"a": "b"} - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number (Encryption enabled) -def test_9(): - channel = "test_9-" + str(time.time()) - message = 100 - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number string (Encryption enabled) -def test_10(): - channel = "test_10-" + str(time.time()) - message = "100" - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive object string (Encryption enabled) -def test_11(): - channel = "test_11-" + str(time.time()) - message = '{"a" : "b"}' - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive array string (Encryption enabled) -def test_12(): - channel = "test_12-" + str(time.time()) - message = '[1,2]' - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -x = 5 - - -def run_test(t): - global x - x += 5 - i = (x / 5) - 1 - - def _print(): - print('Running test ' + str(i)) - - pubnub.timeout(x, _print) - pubnub.timeout(x + 1, t) - - -def stop(): - pubnub.stop() - - -run_test(test_1) -run_test(test_2) -run_test(test_3) -run_test(test_4) -run_test(test_5) -run_test(test_6) -run_test(test_7) -run_test(test_8) -run_test(test_9) -run_test(test_10) -run_test(test_11) -run_test(stop) - -pubnub_enc.start() diff --git a/python-twisted/LICENSE b/python-twisted/LICENSE deleted file mode 100644 index 3efa3922..00000000 --- a/python-twisted/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks -Copyright (c) 2013 PubNub Inc. -http://www.pubnub.com/ -http://www.pubnub.com/terms - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks -Copyright (c) 2013 PubNub Inc. -http://www.pubnub.com/ -http://www.pubnub.com/terms diff --git a/python-twisted/README.md b/python-twisted/README.md deleted file mode 100644 index 0677eff3..00000000 --- a/python-twisted/README.md +++ /dev/null @@ -1,137 +0,0 @@ -## Contact support@pubnub.com for all questions - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Twisted Client - -## IO Event Loop -Be sure to eventually start the event loop or PubNub won't run! - -``` -pubnub.start() -``` - -#### Import -``` -from pubnub import PubnubTwisted as Pubnub -``` - -#### Init -``` -pubnub = Pubnub(publish_key="demo", subscribe_key="demo", ssl_on=False) -``` - -#### Publish Example -``` -channel = 'hello_world' -message = 'Hello World !!!' - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.publish(channel, message, callback=callback, error=callback) -``` - -#### Subscribe Example -``` -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### History Example -``` -def callback(message): - print(message) - -pubnub.history(channel, count=2, callback=callback, error=callback) -``` - -#### Here Now Example -``` -def callback(message): - print(message) - -pubnub.here_now(channel, callback=callback, error=callback) -``` - -#### Presence Example -``` -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - -pubnub.presence(channel, callback=callback, error=callback) -``` - -#### Unsubscribe Example -``` -pubnub.unsubscribe(channel='hello_world') -``` - -#### Grant Example -``` -authkey = "abcd" - -def callback(message): - print(message) - -pubnub.grant(channel, authkey, True, True, callback=callback, error=callback) - -``` - -#### Audit Example -``` -authkey = "abcd" - -def callback(message): - print(message) - -pubnub.audit(channel, authkey, callback=callback, error=callback) -``` - -#### Revoke Example -``` -authkey = "abcd" - -def callback(message): - print(message) - -pubnub.revoke(channel, authkey, callback=callback, error=callback) -``` - - -#### IO Event Loop start -``` -pubnub.start() -``` - -## Contact support@pubnub.com for all questions diff --git a/python-twisted/examples/audit.py b/python-twisted/examples/audit.py deleted file mode 100755 index 2f2b08a2..00000000 --- a/python-twisted/examples/audit.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.audit(channel, auth_key=authkey, callback=callback, error=callback) - -pubnub.start() diff --git a/python-twisted/examples/echo-client.py b/python-twisted/examples/echo-client.py deleted file mode 100755 index 510fee18..00000000 --- a/python-twisted/examples/echo-client.py +++ /dev/null @@ -1,99 +0,0 @@ -# www.pubnub.com - PubNub - Data Stream Network -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Import Libs -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -from pubnub import PubnubTwisted as Pubnub - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Configuration -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -publish_key = 'pub-c-f6a20151-db8d-45af-ba42-def0edaa459f' -subscribe_key = 'sub-c-b5ff3208-7f64-11e4-b601-02ee2ddab7fe' -server_channel = 'echo-server' -client_channel = 'echo-channel' - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Create PubNub Instance -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -pubnub = Pubnub( - publish_key=publish_key, - subscribe_key=subscribe_key, - ssl_on=True -) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Error Log -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def error_log(data): - print(data) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Access Log -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def access_log(data): - print(data) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Respond -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def request(): - pubnub.publish( - server_channel, - {'response': client_channel, 'body': "Hello"}, - callback=access_log, - error=error_log - ) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Request Received -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onResponse(data, channel): - print("Channel: %s | Req: %s" % (channel, data)) - request() - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Ready to Receive Requests -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onReady(message): - print("Ready to Receive Requests on '%s'" % server_channel) - request() - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Network Recovered -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onReconnect(message): - print("RECONNECTED") - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Network Failed -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onDisconnect(message): - print("DISCONNECTED") - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Start Echo Server -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -pubnub.subscribe( - client_channel, - callback=onResponse, - error=error_log, - connect=onReady, - reconnect=onReconnect, - disconnect=onDisconnect -) - -pubnub.start() diff --git a/python-twisted/examples/echo-server.py b/python-twisted/examples/echo-server.py deleted file mode 100755 index 9485f4d6..00000000 --- a/python-twisted/examples/echo-server.py +++ /dev/null @@ -1,104 +0,0 @@ -# www.pubnub.com - PubNub - Data Stream Network -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Import Libs -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -from pubnub import PubnubTwisted as Pubnub - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Configuration -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -publish_key = 'pub-c-f6a20151-db8d-45af-ba42-def0edaa459f' -subscribe_key = 'sub-c-b5ff3208-7f64-11e4-b601-02ee2ddab7fe' -server_channel = 'echo-server' - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Create PubNub Instance -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -pubnub = Pubnub( - publish_key=publish_key, - subscribe_key=subscribe_key, - ssl_on=True -) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Error Log -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def error_log(data): - print(data) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Access Log -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def access_log(data): - print(data) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Respond -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def respond(channel, body): - pubnub.publish( - channel, - body, - callback=access_log, - error=error_log - ) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Request Received -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onRequest(request, channel): - response_channel = request['response'] - response_body = request['body'] - - print("Channel: %s | Req: %s" % (channel, request)) - - respond( - channel=response_channel, - body=response_body - ) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Ready to Receive Requests -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onReady(message): - print("Ready to Receive Requests on '%s'" % server_channel) - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Network Recovered -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onReconnect(message): - print("RECONNECTED") - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Network Failed -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -def onDisconnect(message): - print("DISCONNECTED") - - -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -# Start Echo Server -# =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -pubnub.subscribe( - server_channel, - callback=onRequest, - error=error_log, - connect=onReady, - reconnect=onReconnect, - disconnect=onDisconnect -) - -pubnub.start() diff --git a/python-twisted/examples/grant.py b/python-twisted/examples/grant.py deleted file mode 100755 index f300c35f..00000000 --- a/python-twisted/examples/grant.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.grant(channel, authkey, True, True, callback=callback, error=callback) - -pubnub.start() diff --git a/python-twisted/examples/here-now.py b/python-twisted/examples/here-now.py deleted file mode 100755 index 76a8ea8a..00000000 --- a/python-twisted/examples/here-now.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' - - -# Asynchronous usage -def callback(message): - print(message) - pubnub.stop() - - -pubnub.here_now(channel, callback=callback, error=callback) - -pubnub.start() diff --git a/python-twisted/examples/history.py b/python-twisted/examples/history.py deleted file mode 100755 index 12ce9d39..00000000 --- a/python-twisted/examples/history.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'a' - - -# Asynchronous usage -def callback(message): - print(message) - pubnub.stop() - - -pubnub.history(channel, count=2, callback=callback, error=callback) - -pubnub.start() diff --git a/python-twisted/examples/publish.py b/python-twisted/examples/publish.py deleted file mode 100755 index e618a197..00000000 --- a/python-twisted/examples/publish.py +++ /dev/null @@ -1,36 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -message = 'Hello World !!!' - - -# Asynchronous usage -def callback(message): - print(message) - pubnub.stop() - - -pubnub.publish(channel, message, callback=callback, error=callback) - -pubnub.start() diff --git a/python-twisted/examples/revoke.py b/python-twisted/examples/revoke.py deleted file mode 100755 index e8008566..00000000 --- a/python-twisted/examples/revoke.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - - -def callback(message): - print(message) - pubnub.stop() - - -pubnub.revoke(channel, authkey, callback=callback, error=callback) - -pubnub.start() diff --git a/python-twisted/examples/subscribe.py b/python-twisted/examples/subscribe.py deleted file mode 100755 index d5b9b77f..00000000 --- a/python-twisted/examples/subscribe.py +++ /dev/null @@ -1,52 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - -channel = 'a' - - -# Asynchronous usage -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) - -pubnub.start() diff --git a/python-twisted/examples/subscribe_group.py b/python-twisted/examples/subscribe_group.py deleted file mode 100755 index f3909e5f..00000000 --- a/python-twisted/examples/subscribe_group.py +++ /dev/null @@ -1,54 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'abcd' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on, daemon=False) - -channel = 'ab' - - -# Asynchronous usage -def callback(message, channel): - print(str(message) + ' , ' + channel) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED " + str(message)) - - -def reconnect(message): - print("RECONNECTED " + str(message)) - - -def disconnect(message): - print("DISCONNECTED " + str(message)) - - -print(pubnub.channel_group_add_channel(channel_group='abc', channel="a")) - -pubnub.subscribe_group(channel_groups='abc', callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) - -pubnub.start() diff --git a/python-twisted/migration.md b/python-twisted/migration.md deleted file mode 100644 index 924fa7c3..00000000 --- a/python-twisted/migration.md +++ /dev/null @@ -1,205 +0,0 @@ -## Contact support@pubnub.com for all questions - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Twisted Migration - -#### Import - -``` -# Pre 3.5: -from pubnub import Pubnub - -# New in 3.5+ -from pubnub import PubnubTwisted as Pubnub - -``` - - -#### Init - -``` - -# Pre 3.5: -pubnub = Pubnub( - "demo", ## PUBLISH_KEY - "demo", ## SUBSCRIBE_KEY - False ## SSL_ON? -) - -# New in 3.5+ -pubnub = Pubnub(publish_key="demo", subscribe_key="demo", ssl_on=False) - -``` - -#### PUBLISH - -``` -channel = 'hello_world' -message = 'Hello World !!!' - -# Pre 3.5: -def callback(messages): - print(messages) - -pubnub.publish( { - 'channel' : channel, - 'message' : message, - 'callback' : callback -}) - -# New in 3.5+ - -def callback(message): - print(message) - -pubnub.publish(channel, message, callback=callback, error=callback) - -``` - - -#### SUBSCRIBE - -``` - -# Listen for Messages - -channel = 'hello_world' - -# Pre 3.5: -def connected() : - print('CONNECTED') - -def message_received(message): - print(message) - -pubnub.subscribe({ - 'channel' : channel, - 'connect' : connected, - 'callback' : message_received -}) - -# New in 3.5+ - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### Unsubscribe -Once subscribed, you can easily, gracefully, unsubscribe: - -``` -# Pre 3.5: -pubnub.unsubscribe({ - 'channel' : 'hello_world' -}) - -# New in 3.5+ - -pubnub.unsubscribe(channel='hello_world') -``` - -#### PRESENCE - -``` - -# Pre 3.5: -# - -# New in 3.5+ - -# Listen for Presence Event Messages - -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - -pubnub.presence(channel, callback=callback, error=callback) -``` - -#### HERE_NOW - -``` - -channel = 'hello_world' - -# Pre 3.5: -def callback(messages): - print(messages) - -pubnub.here_now( { - 'channel' : channel, - 'callback' : callback -}) - - -# New in 3.5+ - -# Get info on who is here right now! - - -def callback(message): - print(message) - -pubnub.here_now(channel, callback=callback, error=callback) -``` - -#### HISTORY - -``` -channel = 'hello_world' - -# Pre 3.5: -def history_complete(messages): - print(messages) - -pubnub.history( { - 'channel' : channel, - 'limit' : 2, - 'callback' : history_complete -}) - - -# New in 3.5+ - -def callback(message): - print(message) - -pubnub.history(channel, count=2, callback=callback, error=callback) -``` - -#### IO Event Loop - -``` - -# Pre 3.5: -reactor.run() - -# New in 3.5+ -pubnub.start() -``` -## Contact support@pubnub.com for all questions diff --git a/python-twisted/tests/benchmark.py b/python-twisted/tests/benchmark.py deleted file mode 100755 index a715d666..00000000 --- a/python-twisted/tests/benchmark.py +++ /dev/null @@ -1,90 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - -import datetime -import sys - -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'demo' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False -origin = len(sys.argv) > 6 and sys.argv[6] or 'pubsub.pubnub.com' - -# ----------------------------------------------------------------------- -# Initiat Class -# ----------------------------------------------------------------------- -pubnub = Pubnub( - publish_key, - subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - ssl_on=ssl_on, - origin=origin -) -crazy = ' ~`!@#$%^&*( 顶顅 Ȓ)+=[]\\{}|;\':",./<>?abcd' - - -# ----------------------------------------------------------------------- -# BENCHMARK -# ----------------------------------------------------------------------- -def success(msg): - print(msg) - - -def connected(msg): - pubnub.publish(crazy, {'Info': 'Connected!'}, error=error, callback=success) - - -def error(err): - print(err) - -trips = {'last': None, 'current': None, 'max': 0, 'avg': 0} - - -def received(message): - current_trip = trips['current'] = str(datetime.datetime.now())[0:19] - last_trip = trips['last'] = str( - datetime.datetime.now() - datetime.timedelta(seconds=1) - )[0:19] - - # New Trip Span (1 Second) - if current_trip not in trips: - trips[current_trip] = 0 - - # Average - if last_trip in trips: - trips['avg'] = (trips['avg'] + trips[last_trip]) / 2 - - # Increment Trip Counter - trips[current_trip] = trips[current_trip] + 1 - - # Update Max - if trips[current_trip] > trips['max']: - trips['max'] = trips[current_trip] - - print(message) - - pubnub.publish(crazy, current_trip + - " Trip: " + - str(trips[current_trip]) + - " MAX: " + - str(trips['max']) + - "/sec " + - " AVG: " + - str(trips['avg']) + - "/sec", error=error) - - -pubnub.subscribe(crazy, received, connect=connected, error=error) - -# ----------------------------------------------------------------------- -# IO Event Loop -# ----------------------------------------------------------------------- -pubnub.start() diff --git a/python-twisted/tests/delivery.py b/python-twisted/tests/delivery.py deleted file mode 100755 index 457c6a93..00000000 --- a/python-twisted/tests/delivery.py +++ /dev/null @@ -1,168 +0,0 @@ -## www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -## PubNub Real-time Push APIs and Notifications Framework -## Copyright (c) 2010 Stephen Blum -## http://www.pubnub.com/ - -## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API -## ----------------------------------- - -import sys -import datetime -import time - -from pubnub import PubnubTwisted as Pubnub - -## ----------------------------------------------------------------------- -## Configuration -## ----------------------------------------------------------------------- -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'demo' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False -origin = len(sys.argv) > 6 and sys.argv[6] or 'pubsub.pubnub.com' -origin = '184.72.9.220' - -## ----------------------------------------------------------------------- -## Analytics -## ----------------------------------------------------------------------- -analytics = { - 'publishes': 0, # Total Send Requests - 'received': 0, # Total Received Messages (Deliveries) - 'queued': 0, # Total Unreceived Queue (UnDeliveries) - 'successful_publishes': 0, # Confirmed Successful Publish Request - 'failed_publishes': 0, # Confirmed UNSuccessful Publish Request - 'failed_deliveries': 0, # (successful_publishes - received) - 'deliverability': 0 # Percentage Delivery -} - -trips = { - 'last': None, - 'current': None, - 'max': 0, - 'avg': 0 -} - -## ----------------------------------------------------------------------- -## Initiat Class -## ----------------------------------------------------------------------- -channel = 'deliverability-' + str(time.time()) -pubnub = Pubnub( - publish_key, - subscribe_key, - secret_key=secret_key, - cipher_key=cipher_key, - ssl_on=ssl_on, - origin=origin -) - -## ----------------------------------------------------------------------- -## BENCHMARK -## ----------------------------------------------------------------------- - - -def publish_sent(info=None): - if info and info[0]: - analytics['successful_publishes'] += 1 - else: - analytics['failed_publishes'] += 1 - - analytics['publishes'] += 1 - analytics['queued'] += 1 - - pubnub.timeout(send, 0.1) - - -def send(): - if analytics['queued'] > 100: - analytics['queued'] -= 10 - return pubnub.timeout(send, 10) - - pubnub.publish({ - 'channel': channel, - 'callback': publish_sent, - 'message': "1234567890" - }) - - -def received(message): - analytics['queued'] -= 1 - analytics['received'] += 1 - current_trip = trips['current'] = str(datetime.datetime.now())[0:19] - last_trip = trips['last'] = str( - datetime.datetime.now() - datetime.timedelta(seconds=1) - )[0:19] - - ## New Trip Span (1 Second) - if current_trip not in trips: - trips[current_trip] = 0 - - ## Average - if last_trip in trips: - trips['avg'] = (trips['avg'] + trips[last_trip]) / 2 - - ## Increment Trip Counter - trips[current_trip] = trips[current_trip] + 1 - - ## Update Max - if trips[current_trip] > trips['max']: - trips['max'] = trips[current_trip] - - -def show_status(): - ## Update Failed Deliveries - analytics['failed_deliveries'] = \ - analytics['successful_publishes'] \ - - analytics['received'] - - ## Update Deliverability - analytics['deliverability'] = ( - float(analytics['received']) / - float(analytics['successful_publishes'] or 1.0) - ) * 100.0 - - ## Print Display - print(( - "max:%(max)03d/sec " + - "avg:%(avg)03d/sec " + - "pubs:%(publishes)05d " + - "received:%(received)05d " + - "spub:%(successful_publishes)05d " + - "fpub:%(failed_publishes)05d " + - "failed:%(failed_deliveries)05d " + - "queued:%(queued)03d " + - "delivery:%(deliverability)03f%% " + - "" - ) % { - 'max': trips['max'], - 'avg': trips['avg'], - 'publishes': analytics['publishes'], - 'received': analytics['received'], - 'successful_publishes': analytics['successful_publishes'], - 'failed_publishes': analytics['failed_publishes'], - 'failed_deliveries': analytics['failed_deliveries'], - 'publishes': analytics['publishes'], - 'deliverability': analytics['deliverability'], - 'queued': analytics['queued'] - }) - pubnub.timeout(show_status, 1) - - -def connected(): - show_status() - pubnub.timeout(send, 1) - -print("Connected: %s\n" % origin) -pubnub.subscribe({ - 'channel': channel, - 'connect': connected, - 'callback': received -}) - -## ----------------------------------------------------------------------- -## IO Event Loop -## ----------------------------------------------------------------------- -pubnub.start() diff --git a/python-twisted/tests/subscribe-test.py b/python-twisted/tests/subscribe-test.py deleted file mode 100755 index fd33ff7a..00000000 --- a/python-twisted/tests/subscribe-test.py +++ /dev/null @@ -1,156 +0,0 @@ -## www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -## PubNub Real-time Push APIs and Notifications Framework -## Copyright (c) 2010 Stephen Blum -## http://www.pubnub.com/ - -## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API -## ----------------------------------- - -import sys -from pubnub import PubnubTwisted as Pubnub -from functools import partial -from threading import current_thread -import threading -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or None -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -## ----------------------------------------------------------------------- -## Initiate Pubnub State -## ----------------------------------------------------------------------- -#pubnub = Pubnub( publish_key, subscribe_key, secret_key, cipher_key, ssl_on ) -pubnub = Pubnub(publish_key, subscribe_key, secret_key, ssl_on) -crazy = 'hello_world' - -current = -1 - -errors = 0 -received = 0 - -## ----------------------------------------------------------------------- -## Subscribe Example -## ----------------------------------------------------------------------- - - -def message_received(message): - print(message) - - -def check_received(message): - global current - global errors - global received - print(message) - print(current) - if message <= current: - print('ERROR') - #sys.exit() - errors += 1 - else: - received += 1 - print('active thread count : ', threading.activeCount()) - print('errors = ', errors) - print(current_thread().getName(), ' , ', 'received = ', received) - - if received != message: - print('********** MISSED **************** ', message - received) - current = message - - -def connected_test(ch): - print('Connected', ch) - - -def connected(ch): - pass - - -''' -pubnub.subscribe({ - 'channel' : 'abcd1', - 'connect' : connected, - 'callback' : message_received -}) -''' - - -def cb1(): - pubnub.subscribe({ - 'channel': 'efgh1', - 'connect': connected, - 'callback': message_received - }) - - -def cb2(): - pubnub.subscribe({ - 'channel': 'dsm-test', - 'connect': connected_test, - 'callback': check_received - }) - - -def cb3(): - pubnub.unsubscribe({'channel': 'efgh1'}) - - -def cb4(): - pubnub.unsubscribe({'channel': 'abcd1'}) - - -def subscribe(channel): - pubnub.subscribe({ - 'channel': channel, - 'connect': connected, - 'callback': message_received - }) - - -print(threading.activeCount()) - - -pubnub.timeout(15, cb1) - -pubnub.timeout(30, cb2) - - -pubnub.timeout(45, cb3) - -pubnub.timeout(60, cb4) - -#''' -for x in range(1, 1000): - #print x - def y(t): - subscribe('channel-' + str(t)) - - def z(t): - pubnub.unsubscribe({'channel': 'channel-' + str(t)}) - - pubnub.timeout(x + 5, partial(y, x)) - pubnub.timeout(x + 25, partial(z, x)) - x += 10 -#''' - -''' -for x in range(1,1000): - def cb(r): print r , ' : ', threading.activeCount() - def y(t): - pubnub.publish({ - 'message' : t, - 'callback' : cb, - 'channel' : 'dsm-test' - }) - - - pubnub.timeout(x + 1, partial(y,x)) - x += 1 -''' - - -pubnub.start() diff --git a/python-twisted/tests/test_grant_async.py b/python-twisted/tests/test_grant_async.py deleted file mode 100755 index 7fe66cbe..00000000 --- a/python-twisted/tests/test_grant_async.py +++ /dev/null @@ -1,365 +0,0 @@ -import time - -from pubnub import PubnubTwisted as Pubnub - -subkey = "sub-c-9aeec0d4-cdf4-11e5-bcee-0619f8945a4f" -pubkey = "pub-c-b3fdf8fc-4516-4ab2-8836-6fb22ba7870d" -secretkey = "sec-c-ZDQwNTUwMDctZDViYi00MzhlLTg2NTctYjViZDcwNTA5Zjhj" -pubnub = Pubnub(pubkey, subkey) -pubnub_pam = Pubnub(pubkey, subkey, secretkey) - - -# Grant permission read true, write true, on channel ( Async Mode ) -def test_1(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {u'abcd': {u'r': 1, u'w': 1}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': u'abcd', u'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, write=True, ttl=1, callback=_callback, error=_error) - - -# Grant permission read false, write false, on channel ( Async Mode ) -def test_2(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {u'abcd': {u'r': 0, u'm': 0, u'w': 0}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': u'abcd', u'ttl': 1} - } - - def _error(response): - print("error") - print(response) - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, write=False, ttl=1, callback=_callback, error=_error) - - -# Grant permission read True, write false, on channel ( Async Mode ) -def test_3(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {u'abcd': {u'r': 1, u'm': 0, u'w': 0}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': u'abcd', u'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, write=False, ttl=1, callback=_callback, error=_error) - - -# Grant permission read False, write True, on channel ( Async Mode ) -def test_4(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {u'abcd': {u'r': 0, u'm': 0, u'w': 1}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': u'abcd', u'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, write=True, ttl=1, callback=_callback, error=_error) - - -# Grant permission read False, write True, on channel ( Async Mode ), TTL 10 -def test_5(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {u'abcd': {u'r': 0, u'm': 0, u'w': 1}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': u'abcd', u'ttl': 10} - } - - def _error(response): - assert False - - pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, write=True, ttl=10, callback=_callback, error=_error) - - -# Grant permission read False, write True, without channel ( Async Mode ), TTL 10 -def test_6(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'r': 0, u'm': 0, u'w': 1, - u'subscribe_key': subkey, - u'level': u'subkey', u'ttl': 10} - } - - def _error(response): - print(response) - assert False - - pubnub_pam.grant(read=False, write=True, ttl=10, callback=_callback, error=_error) - - -# Grant permission read False, write False, without channel ( Async Mode ) -def test_7(): - def _callback(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'r': 0, u'm': 0, u'w': 0, - u'subscribe_key': subkey, - u'level': u'subkey', u'ttl': 1} - } - - def _error(response): - assert False - - pubnub_pam.grant(read=False, write=False, callback=_callback, error=_error) - - -# Complete flow , try publish on forbidden channel, grant permission to subkey and try again. ( Sync Mode) - -def test_8(): - channel = "test_8-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb2(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {auth_key: {u'r': 1, u'm': 0, u'w': 1}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': channel, u'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _err3(resp): - print(resp) - assert False - - time.sleep(7) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(channel=channel, read=True, write=True, auth_key=auth_key, ttl=10, callback=_cb2, error=_err2) - - -# Complete flow , try publish on forbidden channel, grant permission to authkey and try again. -# then revoke and try again -def test_9(): - channel = "test_9-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb2(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {auth_key: {u'r': 1, u'm': 0, u'w': 1}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': channel, u'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _cb4(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'auths': {auth_key: {u'r': 0, u'm': 0, u'w': 0}}, - u'subscribe_key': subkey, - u'level': u'user', u'channel': channel, u'ttl': 1} - } - - def _cb5(resp, ch=None): - print(resp) - assert False - - def _err5(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {u'channels': [channel]} - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb5, error=_err5) - - def _err4(resp): - assert False - - pubnub_pam.revoke(channel=channel, auth_key=auth_key, callback=_cb4, error=_err4) - - def _err3(resp): - assert False - - time.sleep(7) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(channel=channel, read=True, write=True, auth_key=auth_key, ttl=10, callback=_cb2, error=_err2) - - -# Complete flow , try publish on forbidden channel, grant permission channel level for subkey and try again. -# then revoke and try again -def test_10(): - channel = "test_10-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb1(resp, ch=None): - assert False - - def _err1(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {u'channels': [channel]} - - def _cb2(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'channels': {channel: {u'r': 1, u'm': 0, u'w': 1}}, - u'subscribe_key': subkey, - u'level': u'channel', u'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _cb4(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'channels': {channel: {u'r': 0, u'm': 0, u'w': 0}}, - u'subscribe_key': subkey, - u'level': u'channel', u'ttl': 1} - } - - def _cb5(resp, ch=None): - print(resp) - assert False - - def _err5(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {u'channels': [channel]} - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb5, error=_err5) - - def _err4(resp): - assert False - - pubnub_pam.revoke(channel=channel, callback=_cb4, error=_err4) - - def _err3(resp): - assert False - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(channel=channel, read=True, write=True, ttl=10, callback=_cb2, error=_err2) - - pubnub.publish(channel=channel, message=message, callback=_cb1, error=_err1) - - -# Complete flow , try publish on forbidden channel, grant permission subkey level for subkey and try again. -# then revoke and try again -def test_11(): - channel = "test_11-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - - def _cb2(resp, ch=None): - print(resp) - assert resp == { - 'message': u'Success', - 'payload': {u'r': 1, u'm': 0, u'w': 1, - u'subscribe_key': subkey, - u'level': u'subkey', u'ttl': 10} - } - - def _cb3(resp, ch=None): - assert resp[0] == 1 - - def _cb4(resp, ch=None): - assert resp == { - 'message': u'Success', - 'payload': {u'r': 0, u'm': 0, u'w': 0, - u'subscribe_key': subkey, - u'level': u'subkey', u'ttl': 1} - } - - def _cb5(resp, ch=None): - assert False - - def _err5(resp): - assert resp['message'] == 'Forbidden' - assert resp['payload'] == {u'channels': [channel]} - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb5, error=_err5) - - def _err4(resp): - assert False - - pubnub_pam.revoke(callback=_cb4, error=_err4) - - def _err3(resp): - assert False - - time.sleep(5) - pubnub.publish(channel=channel, message=message, callback=_cb3, error=_err3) - - def _err2(resp): - assert False - - pubnub_pam.grant(read=True, write=True, ttl=10, callback=_cb2, error=_err2) - - -x = 5 - - -def run_test(t): - global x - x += 5 - i = (x / 5) - 1 - - def _print(): - print('Running test ' + str(i)) - - pubnub.timeout(x, _print) - pubnub.timeout(x + 1, t) - - -def stop(): - pubnub.stop() - - -run_test(test_1) -run_test(test_2) -run_test(test_3) -run_test(test_4) -run_test(test_5) -run_test(test_6) -run_test(test_7) -run_test(test_8) -run_test(test_9) -run_test(test_10) -run_test(test_11) -run_test(stop) - -pubnub_pam.start() diff --git a/python-twisted/tests/test_publish_async.py b/python-twisted/tests/test_publish_async.py deleted file mode 100755 index a188cfbd..00000000 --- a/python-twisted/tests/test_publish_async.py +++ /dev/null @@ -1,333 +0,0 @@ -import time -# from twisted.trial import unittest - -from pubnub import PubnubTwisted as Pubnub - -pubkey = "pub-c-37d3c709-c35e-487a-8b33-2314d9b62b28" -subkey = "sub-c-cd0b6288-cdf5-11e5-bcee-0619f8945a4f" -pubnub = Pubnub(pubkey, subkey) -pubnub_enc = Pubnub(pubkey, subkey, cipher_key="enigma") - - -# class PublishTests(unittest.TestCase): -def test_1(): - channel = "test_1-" + str(time.time()) - message = "I am a string" - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive array -def test_2(): - channel = "test_2-" + str(time.time()) - message = [1, 2] - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - print(resp) - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive json object -def test_3(): - channel = "test_2-" + str(time.time()) - message = {"a": "b"} - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number -def test_4(): - channel = "test_2-" + str(time.time()) - message = 100 - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number string -def test_5(): - channel = "test_5-" + str(time.time()) - message = "100" - - def _cb(resp, ch=None): - assert resp == message - pubnub.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive string (Encryption enabled) -def test_6(): - channel = "test_6-" + str(time.time()) - message = "I am a string" - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive array (Encryption enabled) -def test_7(): - channel = "test_7-" + str(time.time()) - message = [1, 2] - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive json object (Encryption enabled) -def test_8(): - channel = "test_8-" + str(time.time()) - message = {"a": "b"} - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number (Encryption enabled) -def test_9(): - channel = "test_9-" + str(time.time()) - message = 100 - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive number string (Encryption enabled) -def test_10(): - channel = "test_10-" + str(time.time()) - message = "100" - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive object string (Encryption enabled) -def test_11(): - channel = "test_11-" + str(time.time()) - message = '{"a" : "b"}' - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -# Publish and receive array string (Encryption enabled) -def test_12(): - channel = "test_12-" + str(time.time()) - message = '[1,2]' - - def _cb(resp, ch=None): - assert resp == message - pubnub_enc.unsubscribe(channel) - - def _connect(resp): - def _cb1(resp, ch=None): - assert resp[0] == 1 - - def _err1(resp): - assert False - - pubnub_enc.publish(channel, message, callback=_cb1, error=_err1) - - def _error(resp): - assert False - - pubnub_enc.subscribe(channel, callback=_cb, connect=_connect, error=_error) - - -x = 5 - - -def run_test(t): - global x - x += 5 - i = (x / 5) - 1 - - def _print(): - print('Running test ' + str(i)) - - pubnub.timeout(x, _print) - pubnub.timeout(x + 1, t) - - -def stop(): - pubnub.stop() - - -run_test(test_1) -run_test(test_2) -run_test(test_3) -run_test(test_4) -run_test(test_5) -run_test(test_6) -run_test(test_7) -run_test(test_8) -run_test(test_9) -run_test(test_10) -run_test(test_11) -run_test(stop) - -pubnub_enc.start() diff --git a/python-twisted/tests/unit-test-full.py b/python-twisted/tests/unit-test-full.py deleted file mode 100644 index 2335ef6e..00000000 --- a/python-twisted/tests/unit-test-full.py +++ /dev/null @@ -1,230 +0,0 @@ -## www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -## PubNub Real-time Push APIs and Notifications Framework -## Copyright (c) 2010 Stephen Blum -## http://www.pubnub.com/ - -## TODO Tests -## -## - wait 20 minutes, send a message, receive and success. -## - -## - -## -## - -## ----------------------------------- -## PubNub 3.1 Real-time Push Cloud API -## ----------------------------------- - -import sys -from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or None -cipher_key = len(sys.argv) > 4 and sys.argv[4] or None -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -## ----------------------------------------------------------------------- -## Command Line Options Supplied PubNub -## ----------------------------------------------------------------------- -pubnub_user_supplied_options = Pubnub( - publish_key, # OPTIONAL (supply None to disable) - subscribe_key, # REQUIRED - secret_key, # OPTIONAL (supply None to disable) - cipher_key, # OPTIONAL (supply None to disable) - ssl_on # OPTIONAL (supply None to disable) -) - -## ----------------------------------------------------------------------- -## High Security PubNub -## ----------------------------------------------------------------------- -pubnub_high_security = Pubnub( - ## Publish Key - 'pub-c-a30c030e-9f9c-408d-be89-d70b336ca7a0', - - ## Subscribe Key - 'sub-c-387c90f3-c018-11e1-98c9-a5220e0555fd', - - ## Secret Key - 'sec-c-MTliNDE0NTAtYjY4Ni00MDRkLTllYTItNDhiZGE0N2JlYzBl', - - ## Cipher Key - 'YWxzamRmbVjFaa05HVnGFqZHM3NXRBS73jxmhVMkjiwVVXV1d5UrXR1JLSkZFRr' + - 'WVd4emFtUm1iR0TFpUZvbiBoYXMgYmVlbxWkhNaF3uUi8kM0YkJTEVlZYVFjBYi' + - 'jFkWFIxSkxTa1pGUjd874hjklaTFpUwRVuIFNob3VsZCB5UwRkxUR1J6YVhlQWa' + - 'V1ZkNGVH32mDkdho3pqtRnRVbTFpUjBaeGUgYXNrZWQtZFoKjda40ZWlyYWl1eX' + - 'U4RkNtdmNub2l1dHE2TTA1jd84jkdJTbFJXYkZwWlZtRnKkWVrSRhhWbFpZVmFz' + - 'c2RkZmTFpUpGa1dGSXhTa3hUYTFwR1Vpkm9yIGluZm9ybWFNfdsWQdSiiYXNWVX' + - 'RSblJWYlRGcFVqQmFlRmRyYUU0MFpXbHlZV2wxZVhVNFJrTnR51YjJsMWRIRTJU' + - 'W91ciBpbmZvcm1hdGliBzdWJtaXR0ZWQb3UZSBhIHJlc3BvbnNlLCB3ZWxsIHJl' + - 'VEExWdHVybiB0am0aW9uIb24gYXMgd2UgcG9zc2libHkgY2FuLuhcFe24ldWVns' + - 'dSaTFpU3hVUjFKNllWaFdhRmxZUWpCaQo34gcmVxdWlGFzIHNveqQl83snBfVl3', - - ## 2048bit SSL ON - ENABLED TRUE - True -) - -## ----------------------------------------------------------------------- -## Channel | Message Test Data (UTF-8) -## ----------------------------------------------------------------------- -crazy = ' ~`â¦â§!@#$%^&*(顶顅Ȓ)+=[]\\{}|;\':",./<>?abcd' -many_channels = [str(x) + '-many_channel_test' for x in range(10)] -runthroughs = 0 -planned_tests = 2 -delivery_retries = 0 -max_retries = 10 - -## ----------------------------------------------------------------------- -## Unit Test Function -## ----------------------------------------------------------------------- - - -def test(trial, name): - if trial: - print('PASS: ' + name) - else: - print('- FAIL - ' + name) - - -def test_pubnub(pubnub): - global runthroughs, planned_tests, delivery_retries, max_retries - - ## ----------------------------------------------------------------------- - ## Many Channels - ## ----------------------------------------------------------------------- - def phase2(): - status = { - 'sent': 0, - 'received': 0, - 'connections': 0 - } - - def received(message, chan): - global runthroughs - - test(status['received'] <= status['sent'], 'many sends') - status['received'] += 1 - pubnub.unsubscribe({'channel': chan}) - if status['received'] == len(many_channels): - runthroughs += 1 - if runthroughs == planned_tests: - pubnub.stop() - - def publish_complete(info, chan): - global delivery_retries, max_retries - status['sent'] += 1 - test(info, 'publish complete') - test(info and len(info) > 2, 'publish response') - if not info[0]: - delivery_retries += 1 - if max_retries > delivery_retries: - sendit(chan) - - def sendit(chan): - tchan = chan - pubnub.publish({ - 'channel': chan, - 'message': "Hello World", - 'callback': (lambda msg: publish_complete(msg, tchan)) - }) - - def connected(chan): - status['connections'] += 1 - sendit(chan) - - def delivered(info): - if info and info[0]: - status['sent'] += 1 - - def subscribe(chan): - pubnub.subscribe({ - 'channel': chan, - 'connect': (lambda: connected(chan + '')), - 'callback': (lambda msg: received(msg, chan)) - }) - - ## Subscribe All Channels - for chan in many_channels: - subscribe(chan) - - ## ----------------------------------------------------------------------- - ## Time Example - ## ----------------------------------------------------------------------- - def time_complete(timetoken): - test(timetoken, 'timetoken fetch') - test(isinstance(timetoken, int), 'timetoken int type') - - pubnub.time({'callback': time_complete}) - - ## ----------------------------------------------------------------------- - ## Publish Example - ## ----------------------------------------------------------------------- - def publish_complete(info): - test(info, 'publish complete') - test(info and len(info) > 2, 'publish response') - - pubnub.history({ - 'channel': crazy, - 'limit': 10, - 'callback': history_complete - }) - - ## ----------------------------------------------------------------------- - ## History Example - ## ----------------------------------------------------------------------- - def history_complete(messages): - test(messages and len(messages) > 0, 'history') - test(messages, 'history') - - pubnub.publish({ - 'channel': crazy, - 'message': "Hello World", - 'callback': publish_complete - }) - - ## ----------------------------------------------------------------------- - ## Subscribe Example - ## ----------------------------------------------------------------------- - def message_received(message): - test(message, 'message received') - pubnub.unsubscribe({'channel': crazy}) - - def done(): - pubnub.unsubscribe({'channel': crazy}) - pubnub.publish({ - 'channel': crazy, - 'message': "Hello World", - 'callback': (lambda x: x) - }) - - def dumpster(message): - test(0, 'never see this') - - pubnub.subscribe({ - 'channel': crazy, - 'connect': done, - 'callback': dumpster - }) - - def connected(): - pubnub.publish({ - 'channel': crazy, - 'message': {'Info': 'Connected!'} - }) - - pubnub.subscribe({ - 'channel': crazy, - 'connect': connected, - 'callback': message_received - }) - - phase2() - -## ----------------------------------------------------------------------- -## Run Tests -## ----------------------------------------------------------------------- -test_pubnub(pubnub_user_supplied_options) -test_pubnub(pubnub_high_security) -pubnub_high_security.start() diff --git a/python/LICENSE b/python/LICENSE deleted file mode 100644 index 3efa3922..00000000 --- a/python/LICENSE +++ /dev/null @@ -1,27 +0,0 @@ -PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks -Copyright (c) 2013 PubNub Inc. -http://www.pubnub.com/ -http://www.pubnub.com/terms - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. - -PubNub Real-time Cloud-Hosted Push API and Push Notification Client Frameworks -Copyright (c) 2013 PubNub Inc. -http://www.pubnub.com/ -http://www.pubnub.com/terms diff --git a/python/README.md b/python/README.md deleted file mode 100644 index 2fce1bae..00000000 --- a/python/README.md +++ /dev/null @@ -1,400 +0,0 @@ -## Contact support@pubnub.com for all questions - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Standalone Python Client - -#### Init - -``` -pubnub = Pubnub(publish_key="demo", subscribe_key="demo", ssl_on=False) - -``` - -#### PUBLISH - -``` -channel = 'hello_world' -message = 'Hello World !!!' - -# Synchronous usage -print pubnub.publish(channel=channel, message=message) - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.publish(channel=channel, message=message, callback=callback, error=callback) - -``` - - -#### SUBSCRIBE - -``` -# Listen for Messages - -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channels=channel, callback=callback, error=error, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### SUBSCRIBE to group - -``` -# Listen for Messages - -channel_group = 'group1' - -def callback(message, channel_group, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe_group(channel_groups=channel_group, callback=callback, error=error, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### SUBSCRIBE Synchronous ( compatible with pre-3.5 ) -Runs in tight loop if callback return True. -Loop ends when callback return False -``` -# Listen for Messages - -channel = 'hello_world' - -def callback(message): - print(message) - return True - -pubnub.subscribe_sync(channel=channel, callback=callback) -``` - - -#### UNSUBSCRIBE - -``` -# Listen for Messages - -channel = 'hello_world' - -pubnub.unsubscribe(channel=channel) -``` - - -#### PRESENCE - -``` -# Listen for Presence Event Messages - -channel = 'hello_world' - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - - -pubnub.presence(channel=channel, callback=callback, error=error) -``` - -#### PRESENCE channel group - -``` -# Listen for Presence Event Messages - -channel_group = 'group1' - -def callback(message, channel_group, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - - -pubnub.presence_group(channel_group=channel_group, callback=callback, error=error) -``` - -#### HERE_NOW - -``` -# Get info on who is here right now! - -channel = 'hello_world' - -# Synchronous usage -print pubnub.here_now(channel=channel) - - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.here_now(channel=channel, callback=callback, error=callback) -``` - -#### HISTORY - -``` -# Synchronous usage - -print pubnub.history(channel=channel, count=2) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.history(channel=channel, count=2, callback=callback, error=callback) -``` - -#### HISTORY (including timetokens) - -``` -# Synchronous usage - -print pubnub.history(channel, count=2, include_token=True) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.history(channel, count=2, include_token=True, callback=callback, error=callback) -``` - - -#### GRANT - -``` -authkey = "abcd" - -# Synchronous usage -print pubnub.grant(channel=channel, auth_key=authkey, read=True, write=True) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.grant(channel=channel, auth_key=authkey, read=True, write=True, callback=callback, error=callback) -``` - -#### AUDIT - -``` -channel = "hello_world" -authkey = "abcd" - -# Synchronous usage -print pubnub.audit(channel=channel, auth_key=authkey) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.audit(channel=channel, auth_key=authkey, callback=callback, error=callback) -``` - -#### REVOKE - -``` -channel = "hello_world" -authkey = "abcd" - -# Synchronous usage -print pubnub.revoke(channel=channel, auth_key=authkey) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.revoke(channel=channel, auth_key=authkey, callback=callback, error=callback) -``` - -### CHANNEL GROUP METHODS - -#### List Groups - -``` -# Synchronous usage - -print pubnub.channel_group_list_groups(namespace='aaa') - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.channel_group_list_groups(namespace='aaa', callback=callback, error=callback) - -``` - -#### List Channels - -``` -# Synchronous usage - -print pubnub.channel_group_list_channels(channel_group='dev:abcd') - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.channel_group_list_channels(channel_group='dev:abcd', callback=callback, error=callback) - -``` - -#### Add Channel - -``` -# Synchronous usage - -print pubnub.channel_group_add_channel(channel_group='dev:abcd', channel="hi") - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.channel_group_add_channel(channel_group='dev:abcd', channel="hi", callback=callback, error=callback) - -``` - - -#### Remove Channel - -``` -# Synchronous usage - -print pubnub.channel_group_remove_channel(channel_group='dev:abcd', channel="hi") - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.channel_group_remove_channel(channel_group='dev:abcd', channel="hi", callback=callback, error=callback) - -``` - - -#### List Channels - -``` -# Synchronous usage - -print pubnub.channel_group_list_channels(channel_group='dev:abcd') - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.channel_group_add_channel(channel_group='dev:abcd', callback=callback, error=callback) - -``` - -#### Grant - - -``` -# Synchronous usage - -print pubnub.grant(channel_group='dev:abcd', read=True, write=True, manage=True, auth_key="abcd") - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.grant(channel_group='dev:abcd', read=True, write=True, manage=True, auth_key="abcd", callback=callback, error=callback) - -``` - -#### Revoke - -``` -# Synchronous usage - -print pubnub.revoke(channel_group='dev:abcd', auth_key="abcd") - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.revoke(channel_group='dev:abcd', auth_key="abcd", callback=callback, error=callback) - -``` - - -#### Audit - -``` -# Synchronous usage - -print pubnub.audit(channel_group='dev:abcd') - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.audit(channel_group='dev:abcd', callback=callback, error=callback) - -``` - - - -## Contact support@pubnub.com for all questions diff --git a/python/examples/audit.py b/python/examples/audit.py deleted file mode 100755 index b20e9ce3..00000000 --- a/python/examples/audit.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - -# Synchronous usage -print(pubnub.audit(channel, authkey)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.audit(channel, authkey, callback=callback, error=callback) diff --git a/python/examples/config b/python/examples/config deleted file mode 100644 index f35134ff..00000000 --- a/python/examples/config +++ /dev/null @@ -1,9 +0,0 @@ -sessionname pubnub-console -screen -t output tail -f ./pubnub-console.log -split -focus down -screen -t console python console.py "set_output_file" -split -v -focus down -screen -t help vi -R ./console-help.txt -focus up diff --git a/python/examples/config_osx b/python/examples/config_osx deleted file mode 100644 index cdb186cb..00000000 --- a/python/examples/config_osx +++ /dev/null @@ -1,8 +0,0 @@ -sessionname pubnub-console -screen -t help vi -R ./console-help.txt -split -focus down -screen -t output tail -f ./pubnub-console.log -split -focus down -screen -t console python console.py "set_output_file" diff --git a/python/examples/console-help.txt b/python/examples/console-help.txt deleted file mode 100644 index abe92c81..00000000 --- a/python/examples/console-help.txt +++ /dev/null @@ -1,37 +0,0 @@ -********************** HELP ****************************** - -TO EXIT : -Ctrl-A \ followed by y ( on linux ) -Ctrl-A Ctrl-\ followed by y ( on mac osx ) - -TO MOVE BETWEEN PANES . Ctrl-A TAB - -********************************************************** - -PUBLISH - -Usage: publish [options] arg - -Options: - -h, --help show this help message and exit - -c CHANNEL, --channel=CHANNEL - Channel on which to publish - -Examples: - (1) publish -c hello_world hi how r u - (2) pub -c hello_world [1,2] - - - -SUBSCRIBE - -Usage: subscribe [options] arg - -Options: - -h, --help show this help message and exit - -c CHANNEL, --channel=CHANNEL - Channel for subscribe - -Examples: - (1) subscribe -c hello_world - (2) sub -c hello_world \ No newline at end of file diff --git a/python/examples/console.py b/python/examples/console.py deleted file mode 100755 index 5b391bfd..00000000 --- a/python/examples/console.py +++ /dev/null @@ -1,719 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import atexit -import json -import os -import pygments -import readline -import sys -import threading -from cmd2 import Cmd, make_option, options -from datetime import datetime -from pygments.formatters import TerminalFormatter -from pygments.lexers import JsonLexer - -from pubnub import Pubnub - -lexer = JsonLexer() -formatter = TerminalFormatter() - - -def highlight(msg): - return pygments.highlight(msg, lexer, formatter) - - -historyPath = os.path.expanduser("~/.pubnub_console_history") - - -def save_history(historyPath=historyPath): - import readline - readline.write_history_file(historyPath) - - -if os.path.exists(historyPath): - readline.read_history_file(historyPath) - -atexit.register(save_history) - -of = sys.stdout - -color = Cmd() - -stop = None - -full_date = False - - -def stop_2(th): - th._Thread__stop() - - -def stop_3(th): - th._stop() - - -def print_console_2(of, message): - print >> of, message - - -def print_console_3(of, message): - of.write(message) - of.write("\n") - - -print_console = None - -if type(sys.version_info) is tuple: - print_console = print_console_2 - stop = stop_2 -else: - if sys.version_info.major == 2: - print_console = print_console_2 - stop = stop_2 - else: - print_console = print_console_3 - stop = stop_3 - - -def get_date(): - if full_date is True: - return color.colorize(datetime.now().strftime( - '%Y-%m-%d %H:%M:%S'), "magenta") - else: - return color.colorize(datetime.now().strftime( - '%H:%M:%S'), "magenta") - - -def print_ok_normal(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + color.colorize(str(msg), "green"))) - except UnicodeEncodeError: - print_console(of, (msg)) - - of.flush() - - -def print_error_normal(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + color.colorize(color.colorize( - str(msg), "red"), "bold"))) - except UnicodeEncodeError: - print_console(of, (msg)) - of.flush() - - -def print_ok_pretty(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + highlight(json.dumps(msg, indent=2)))) - except UnicodeEncodeError: - print_console(of, (msg)) - - of.flush() - - -def print_error_pretty(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + color.colorize(color.colorize( - "ERROR: ", "red"), "bold") + highlight(json.dumps(msg, indent=2)))) - except UnicodeEncodeError: - print_console(of, (msg)) - of.flush() - - -print_ok = print_ok_pretty -print_error = print_error_pretty - - -class DefaultPubnub(object): - def handlerFunctionClosure(self, name): - def handlerFunction(*args, **kwargs): - print_error("Pubnub not initialized." + - "Use init command to initialize") - - return handlerFunction - - def __getattr__(self, name): - return self.handlerFunctionClosure(name) - - -pubnub = DefaultPubnub() - - -def kill_all_threads(): - for thread in threading.enumerate(): - if thread.isAlive(): - stop(thread) - - -def get_input(message, t=None): - while True: - try: - try: - command = raw_input(message) - except NameError: - command = input(message) - except KeyboardInterrupt: - return None - - command = command.strip() - - if command is None or len(command) == 0: - raise ValueError - - if t is not None and t == bool: - valid = ["True", "true", "1", 1, "y", "Y", "yes", "Yes", "YES"] - if command in valid: - return True - else: - return False - if t is not None: - command = t(command) - else: - command = eval("'" + command + "'") - - return command - except ValueError: - print_error("Invalid input : " + command) - - -def _publish_command_handler(channel, message, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.publish(channel, message, - _callback if async is True else None, - _error if async is True else None)) - - -def _subscribe_command_handler(channel): - def _callback(r, ch): - print_ok(r, ch) - - def _error(r, ch=None): - print_error(r, ch if ch is not None else channel) - - def _disconnect(r): - print_ok("DISCONNECTED", r) - - def _reconnect(r): - print_ok("RECONNECTED", r) - - def _connect(r): - print_ok("CONNECTED", r) - - pubnub.subscribe(channel, _callback, _error, connect=_connect, - disconnect=_disconnect, reconnect=_reconnect) - - -def _unsubscribe_command_handler(channels): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - unsub_list = [] - current_channel_list = pubnub.get_channel_array() - - for channel in channels: - pubnub.unsubscribe(channel) - if (channel in current_channel_list): - unsub_list.append(channel) - - # pubnub.unsubscribe(channel + '-pnpres') - # if (channel + '-pnpres' in current_channel_list): - # unsub_list.append(channel + ' (Presence)') - - if len(unsub_list) > 0: - print_ok('Unsubscribed from : ' + str(unsub_list)) - else: - print_error('Not subscribed to : ' + str(channels)) - - -def _grant_command_handler(channel, auth_key, read, write, ttl, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.grant(channel, auth_key, - read, write, ttl, - _callback if async is True else None, - _error if async is True else None)) - - -def _revoke_command_handler(channel, auth_key, ttl, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.revoke(channel, auth_key, ttl, - _callback if async is True else None, - _error if async is True else None)) - - -def _audit_command_handler(channel, auth_key, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.audit(channel, auth_key, - _callback if async is True else None, - _error if async is True else None)) - - -def _history_command_handler(channel, count, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.history(channel, count, - _callback if async is True else None, - _error if async is True else None)) - - -def _here_now_command_handler(channel, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.here_now(channel, _callback if async is True else None, - _error if async is True else None)) - - -def get_channel_array(): - channels = pubnub.get_channel_array() - - for channel in channels: - if "-pnpres" in channel: - chname = channel.split("-pnpres")[0] - if chname not in channels: - continue - i = channels.index(chname) - channels[i] = channels[i] + color.colorize("(P)", "blue") - channels.remove(channel) - return channels - - -class DevConsole(Cmd): - def __init__(self): - Cmd.__init__(self) - global pubnub - self.intro = "For Help type ? or help . " + \ - "To quit/exit type exit" + "\n" + \ - "Commands can also be provided on command line while starting console (in quotes) ex. " + \ - "pubnub-console 'init -p demo -s demo'" - self.default_channel = None - self.async = False - pubnub = Pubnub("demo", "demo") - self.channel_truncation = 3 - self.prompt = self.get_prompt() - self.publish_key = "demo" - self.subscribe_key = "demo" - self.origin = "pubsub.pubnub.com" - self.auth_key = None - self.cipher_key = None - self.secret_key = "demo" - self.ssl = False - self.uuid = None - self.disable_pretty = False - - def get_channel_origin(self): - cho = "" - channels = get_channel_array() - sl = self.channel_truncation - if len(channels) > int(sl) and int(sl) > 0: - cho += ",".join(channels[:int(sl)]) + " " + str( - len(channels) - int(sl)) + " more..." - else: - cho += ",".join(channels) - - if len(channels) > 0: - cho = color.colorize(cho, "bold") + "@" - - origin = pubnub.get_origin().split("://")[1] - origin += color.colorize(" (SSL)", "green") if pubnub.get_origin( - ).split("://")[0] == "https" else "" - return " [" + cho + color.colorize(origin, "blue") + "] > " - - def get_prompt(self): - prompt = "[" + get_date() + "]" - - if self.default_channel is not None and len(self.default_channel) > 0: - prompt += " [default channel: " + color.colorize( - self.default_channel, "bold") + "]" - - prompt += self.get_channel_origin() - return prompt - - def precmd(self, line): - self.prompt = self.get_prompt() - return line - - # def emptyline(self): - # self.prompt = self.get_prompt() - - def cmdloop_with_keyboard_interrupt(self): - try: - self.cmdloop() - except KeyboardInterrupt: - pass - sys.stdout.write('\n') - kill_all_threads() - - @options([make_option('-p', '--publish-key', action="store", - default=None, help="Publish Key"), - make_option('-s', '--subscribe-key', action="store", - default=None, help="Subscribe Key"), - make_option('-k', '--secret-key', action="store", - default=None, help="cipher Key"), - make_option('-c', '--cipher-key', action="store", - default=None, help="Secret Key"), - make_option('-a', '--auth-key', action="store", - default=None, help="Auth Key"), - make_option('--ssl-on', dest='ssl', action='store_true', - default=False, help="SSL Enabled ?"), - make_option('-o', '--origin', action="store", - default=None, help="Origin"), - make_option('-u', '--uuid', action="store", - default=None, help="UUID"), - make_option('--disable-pretty-print', dest='disable_pretty', action='store_true', - default=False, help="Disable Pretty Print ?") - ]) - def do_init(self, command, opts): - global pubnub - global print_ok - global print_error - global print_ok_normal - global print_error_normal - global print_error_pretty - global print_ok_pretty - - self.publish_key = opts.publish_key if opts.publish_key is not None else self.publish_key - self.subscribe_key = opts.subscribe_key if opts.subscribe_key is not None else self.subscribe_key - self.secret_key = opts.secret_key if opts.secret_key is not None else self.secret_key - self.cipher_key = opts.cipher_key if opts.cipher_key is not None else self.cipher_key - self.auth_key = opts.auth_key if opts.auth_key is not None else self.auth_key - self.origin = opts.origin if opts.origin is not None else self.origin - self.uuid = opts.uuid if opts.uuid is not None else self.uuid - self.ssl = opts.ssl if opts.ssl is not None else self.ssl - self.disable_pretty = opts.disable_pretty if opts.disable_pretty is not None else self.disable_pretty - - pubnub = Pubnub(self.publish_key, - self.subscribe_key, - self.secret_key, - self.cipher_key, - self.auth_key, - self.ssl, - self.origin, - self.uuid) - self.prompt = self.get_prompt() - - if opts.disable_pretty is True: - print_ok = print_ok_normal - print_error = print_error_normal - else: - print_ok = print_ok_pretty - print_error = print_error_pretty - - def do_set_sync(self, command): - """unset_async - Unset Async mode""" - self.async = False - - def do_set_async(self, command): - """set_async - Set Async mode""" - self.async = True - - @options([make_option('-n', '--count', action="store", - default=3, help="Number of channels on prompt") - ]) - def do_set_channel_truncation(self, command, opts): - """set_channel_truncation - Set Channel Truncation""" - - self.channel_truncation = opts.count - - self.prompt = self.get_prompt() - - def do_unset_channel_truncation(self, command): - """unset_channel_truncation - Unset Channel Truncation""" - self.channel_truncation = 0 - self.prompt = self.get_prompt() - - def do_set_full_date(self, command): - global full_date - """do_set_full_date - Set Full Date""" - full_date = True - self.prompt = self.get_prompt() - - def do_unset_full_date(self, command): - global full_date - """do_unset_full_date - Unset Full Date""" - full_date = False - self.prompt = self.get_prompt() - - @options([make_option('-c', '--channel', - action="store", help="Default Channel") - ]) - def do_set_default_channel(self, command, opts): - - if opts.channel is None: - print_error("Missing channel") - return - self.default_channel = opts.channel - self.prompt = self.get_prompt() - - @options([make_option('-f', '--file', action="store", - default="./pubnub-console.log", help="Output file") - ]) - def do_set_output_file(self, command, opts): - global of - try: - of = open(opts.file, 'w+') - except IOError as e: - print_error("Could not set output file. " + e.reason) - - @options([make_option('-c', '--channel', action="store", - help="Channel for here now data") - ]) - def do_here_now(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts.channel is None: - print_error("Missing channel") - return - - _here_now_command_handler(opts.channel, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel for history data"), - make_option('-n', '--count', action="store", - default=5, help="Number of messages") - ]) - def do_get_history(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts.channel is None: - print_error("Missing channel") - return - - _history_command_handler(opts.channel, opts.count, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to publish") - ]) - def do_publish(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts.channel is None: - print_error("Missing channel") - return - - if command is None: - print_error("Missing message") - return - - try: - message = json.loads(str(command)) - except ValueError: - message = str(command) - - _publish_command_handler(opts.channel, message, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to grant"), - make_option('-a', '--auth-key', dest="auth_key", - action="store", - help="Auth Key"), - make_option('-r', '--read-enabled', dest='read', - action='store_true', - default=False, help="Read ?"), - make_option('-w', '--write-enabled', dest='write', - action='store_true', - default=False, help="Write ?"), - make_option('-t', '--ttl', action="store", - default=5, help="TTL"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Grant on presence channel ?") - ]) - def do_grant(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - opts.auth_key = pubnub.auth_key \ - if opts.auth_key is None else opts.auth_key - - _grant_command_handler(opts.channel, opts.auth_key, - opts.read, opts.write, - opts.ttl, async=self.async) - - if opts.presence is True: - _grant_command_handler(opts.channel + '-pnpres', opts.auth_key, - opts.read, opts.write, - opts.ttl, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to revoke"), - make_option('-a', '--auth-key', dest="auth_key", action="store", - help="Auth Key"), - make_option('-t', '--ttl', action="store", - default=5, help="TTL"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Revoke on presence channel ?") - ]) - def do_revoke(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - opts.auth_key = pubnub.auth_key \ - if opts.auth_key is None else opts.auth_key - - _revoke_command_handler( - opts.channel, opts.auth_key, opts.ttl, async=self.async) - - if opts.presence is True: - _revoke_command_handler( - opts.channel + '-pnpres', opts.auth_key, opts.ttl, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to revoke"), - make_option('-a', '--auth-key', dest="auth_key", action="store", - help="Auth Key") - ]) - def do_audit(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - opts.auth_key = pubnub.auth_key \ - if opts.auth_key is None else opts.auth_key - - _audit_command_handler(opts.channel, opts.auth_key, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel for unsubscribe"), - make_option('-a', '--all', action="store_true", dest="all", - default=False, help="Unsubscribe from all channels"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Unsubscribe from presence events ?") - ]) - def do_unsubscribe(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - if (opts.all is True): - opts.channel = [] - chs = pubnub.get_channel_array() - for ch in chs: - if '-pnpres' not in ch: - opts.channel.append(ch) - elif opts.presence is True: - opts.channel.append(ch) - - if opts.channel is None: - print_error("Missing channel") - return - - if not isinstance(opts.channel, list): - ch = [] - ch.append(opts.channel) - opts.channel = ch - - channels = [] - if opts.presence is True and opts.all is False: - for c in opts.channel: - if '-pnpres' not in c: - channels.append(c + '-pnpres') - - for c in opts.channel: - channels.append(c) - - _unsubscribe_command_handler(channels) - self.prompt = self.get_prompt() - - @options([make_option('-c', '--channel', action="store", - help="Channel for subscribe"), - make_option('-g', '--get-channel-list', action="store_true", - dest="get", - default=False, help="Get susbcribed channel list"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Presence events ?") - ]) - def do_subscribe(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts is None: - print_error("Missing argument") - return - - if opts.channel is not None: - _subscribe_command_handler(opts.channel) - - if opts.presence is True: - _subscribe_command_handler(opts.channel + '-pnpres') - - if opts.get is True: - print_ok(get_channel_array()) - self.prompt = self.get_prompt() - - def do_exit(self, args): - kill_all_threads() - return -1 - - # def do_EOF(self, args): - # kill_all_threads() - # return self.do_exit(args) - - # def handler(self, signum, frame): - # kill_all_threads() - - -def main(): - app = DevConsole() - app.cmdloop_with_keyboard_interrupt() - - -if __name__ == "__main__": - main() diff --git a/python/examples/cr.py b/python/examples/cr.py deleted file mode 100755 index 0c106935..00000000 --- a/python/examples/cr.py +++ /dev/null @@ -1,52 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on, auth_key="abcd") -channel = 'hello_world' - - -def callback(message): - print(message) - -print(pubnub.revoke(channel_group='dev:abcd', auth_key="abcd")) -print(pubnub.audit(channel_group="dev:abcd")) -print(pubnub.grant(channel_group='dev:abcd', read=True, write=True, manage=True, auth_key="abcd")) -print(pubnub.channel_group_list_namespaces()) -print(pubnub.channel_group_list_groups(namespace='aaa')) -print(pubnub.channel_group_list_groups(namespace='foo')) -print(pubnub.channel_group_list_channels(channel_group='dev:abcd')) -print(pubnub.channel_group_add_channel(channel_group='dev:abcd', channel="hi")) -print(pubnub.channel_group_list_channels(channel_group='dev:abcd')) -print(pubnub.channel_group_remove_channel(channel_group='dev:abcd', channel="hi")) -print(pubnub.channel_group_list_channels(channel_group='dev:abcd')) - - -pubnub.revoke(channel_group='dev:abcd', auth_key="abcd", callback=callback, error=callback) -pubnub.audit(channel_group="dev:abcd", callback=callback, error=callback) -pubnub.grant(channel_group='dev:abcd', read=True, write=True, manage=True, auth_key="abcd", callback=callback, error=callback) -pubnub.channel_group_list_namespaces(callback=callback, error=callback) -pubnub.channel_group_list_groups(namespace='aaa', callback=callback, error=callback) -pubnub.channel_group_list_groups(namespace='foo', callback=callback, error=callback) -pubnub.channel_group_list_channels(channel_group='dev:abcd', callback=callback, error=callback) -pubnub.channel_group_add_channel(channel_group='dev:abcd', channel="hi", callback=callback, error=callback) -pubnub.channel_group_list_channels(channel_group='dev:abcd', callback=callback, error=callback) -pubnub.channel_group_remove_channel(channel_group='dev:abcd', channel="hi", callback=callback, error=callback) -pubnub.channel_group_list_channels(channel_group='dev:abcd', callback=callback, error=callback) diff --git a/python/examples/dev-console.py b/python/examples/dev-console.py deleted file mode 100755 index 4c4bf5c4..00000000 --- a/python/examples/dev-console.py +++ /dev/null @@ -1,273 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - -from pubnub import Pubnub -from optparse import OptionParser -from datetime import datetime -import threading - -parser = OptionParser() - -parser.add_option("--publish-key", - dest="publish_key", default="demo", - help="Publish Key ( default : 'demo' )") - -parser.add_option("--subscribe-key", - dest="subscribe_key", default="demo", - help="Subscribe Key ( default : 'demo' )") - -parser.add_option("--secret-key", - dest="secret_key", default="demo", - help="Secret Key ( default : 'demo' )") - -parser.add_option("--cipher-key", - dest="cipher_key", default="", - help="Cipher Key") - -parser.add_option("--auth-key", - dest="auth_key", default=None, - help="Auth Key") - -parser.add_option("--origin", - dest="origin", default="pubsub.pubnub.com", - help="Origin ( default: pubsub.pubnub.com )") - -parser.add_option("--ssl-on", - action="store_false", dest="ssl", default=False, - help="SSL") - -parser.add_option("--uuid", - dest="uuid", default=None, - help="UUID") - -(options, args) = parser.parse_args() - -print(options) - -pubnub = Pubnub(options.publish_key, - options.subscribe_key, - options.secret_key, - options.cipher_key, - options.auth_key, - options.ssl, - options.origin, - options.uuid) - - -class color(object): - PURPLE = '\033[95m' - CYAN = '\033[96m' - DARKCYAN = '\033[36m' - BLUE = '\033[94m' - GREEN = '\033[92m' - YELLOW = '\033[93m' - RED = '\033[91m' - BOLD = '\033[1m' - UNDERLINE = '\033[4m' - END = '\033[0m' - - -def print_ok(msg, channel=None): - chstr = color.PURPLE + "[" + datetime.now().strftime( - '%Y-%m-%d %H:%M:%S') + "] " + color.END - chstr += color.CYAN + "[Channel : " + channel + \ - "] " if channel is not None else "" + color.END - try: - print(chstr + color.GREEN + str(msg) + color.END) - except UnicodeEncodeError: - print(msg) - - -def print_error(msg, channel=None): - chstr = color.PURPLE + "[" + datetime.now().strftime( - '%Y-%m-%d %H:%M:%S') + "] " + color.END - chstr += color.CYAN + "[Channel : " + channel + \ - "] " if channel is not None else "" + color.END - try: - print(chstr + color.RED + color.BOLD + str(msg) + color.END) - except UnicodeEncodeError: - print(msg) - - -def kill_all_threads(): - for thread in threading.enumerate(): - if thread.isAlive(): - thread._Thread__stop() - - -def get_input(message, t=None): - while True: - try: - try: - command = raw_input(message) - except NameError: - command = input(message) - except KeyboardInterrupt: - return None - - command = command.strip() - - if command is None or len(command) == 0: - raise ValueError - - if t is not None and t == bool: - valid = ["True", "true", "1", 1, "y", "Y", "yes", "Yes", "YES"] - if command in valid: - return True - else: - return False - if t is not None: - command = t(command) - else: - command = eval("'" + command + "'") - - return command - except ValueError: - print_error("Invalid input : " + command) - - -def _publish_command_handler(): - - channel = get_input("[PUBLISH] Enter Channel Name ", str) - if channel is None: - return - while True: - message = get_input("[PUBLISH] Enter Message \ - ( QUIT or CTRL-C for exit from publish mode ) ") - if message == 'QUIT' or message == 'quit' or message is None: - return - - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - pubnub.publish(channel, message, _callback, _error) - - -def _subscribe_command_handler(): - channel = get_input("[SUBSCRIBE] Enter Channel Name ", str) - - def _callback(r): - print_ok(r, channel) - - def _error(r): - print_error(r, channel) - pubnub.subscribe(channel, _callback, _error) - - -def _unsubscribe_command_handler(): - channel = get_input("[UNSUBSCRIBE] Enter Channel Name ", str) - - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - pubnub.unsubscribe(channel) - - -def _grant_command_handler(): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - channel = get_input("[GRANT] Enter Channel Name ", str) - auth_key = get_input("[GRANT] Enter Auth Key ", str) - ttl = get_input("[GRANT] Enter ttl ", int) - read = get_input("[GRANT] Read ? ", bool) - write = get_input("[GRANT] Write ? ", bool) - pubnub.grant(channel, auth_key, read, write, ttl, _callback) - - -def _revoke_command_handler(): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - channel = get_input("[REVOKE] Enter Channel Name ", str) - auth_key = get_input("[REVOKE] Enter Auth Key ", str) - ttl = get_input("[REVOKE] Enter ttl ", int) - - pubnub.revoke(channel, auth_key, ttl, _callback) - - -def _audit_command_handler(): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - channel = get_input("[AUDIT] Enter Channel Name ", str) - auth_key = get_input("[AUDIT] Enter Auth Key ", str) - pubnub.audit(channel, auth_key, _callback) - - -def _history_command_handler(): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - channel = get_input("[HISTORY] Enter Channel Name ", str) - count = get_input("[HISTORY] Enter Count ", int) - - pubnub.history(channel, count, callback=_callback, error=_error) - - -def _here_now_command_handler(): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - channel = get_input("[HERE NOW] Enter Channel Name ", str) - - pubnub.here_now(channel, callback=_callback, error=_error) - - -commands = [] -commands.append({"command": "publish", "handler": _publish_command_handler}) -commands.append( - {"command": "subscribe", "handler": _subscribe_command_handler}) -commands.append( - {"command": "unsubscribe", "handler": _unsubscribe_command_handler}) -commands.append( - {"command": "here_now", "handler": _here_now_command_handler}) -commands.append({"command": "history", "handler": _history_command_handler}) -commands.append({"command": "grant", "handler": _grant_command_handler}) -commands.append({"command": "revoke", "handler": _revoke_command_handler}) -commands.append({"command": "audit", "handler": _audit_command_handler}) - -# last command is quit. add new commands before this line -commands.append({"command": "QUIT"}) - - -def get_help(): - help = "" - help += "Channels currently subscribed to : " - help += str(pubnub.get_channel_array()) - help += "\n" - for i, v in enumerate(commands): - help += "Enter " + str(i) + " for " + v['command'] + "\n" - return help - - -while True: - command = get_input(color.BLUE + get_help(), int) - if command == len(commands) - 1 or command is None: - kill_all_threads() - break - if command >= len(commands): - print_error("Invalid input " + str(command)) - continue - - commands[command]['handler']() - -# pubnub.start() diff --git a/python/examples/grant.py b/python/examples/grant.py deleted file mode 100755 index 0fad10fd..00000000 --- a/python/examples/grant.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - -# Synchronous usage -print(pubnub.grant(channel, authkey, True, True)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.grant(channel, authkey, True, True, callback=callback, error=callback) diff --git a/python/examples/heartbeat.py b/python/examples/heartbeat.py deleted file mode 100755 index a58646a6..00000000 --- a/python/examples/heartbeat.py +++ /dev/null @@ -1,106 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - -import gevent.monkey -import random -import sys -from datetime import datetime -from pubnub import Pubnub as Pubnub - -gevent.monkey.patch_all() - -# from pubnub import PubnubTornado as Pubnub -# from pubnub import PubnubTwisted as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'ds' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'ds' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'ds' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on, uuid="test-" + str(random.random())) - - -def x(url): - print(url) - - -# pubnub.set_http_debug(x) - -channel = 'ab,cd,ef' -channel_group = "abg,cdg" - - -def set_heartbeat(*argv): - print("Change Heartbeat to ", argv[0]) - pubnub.set_heartbeat(argv[0], argv[1], argv[2]) - - -def set_heartbeat_interval(*argv): - pubnub.set_heartbeat_interval(argv[0]) - - -# pubnub.timeout(0, set_heartbeat, 8) - -# Asynchronous usage -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.channel_group_add_channel("abg", "abcd") -pubnub.channel_group_add_channel("cdg", "efgh") - -pubnub.subscribe(channels=channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) - -pubnub.subscribe_group(channel_groups=channel_group, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) - - -def cb(resp): - print(datetime.now().strftime('%H:%M:%S'), resp) - - -def err(resp): - print(datetime.now().strftime('%H:%M:%S'), resp) - - -pubnub.timeout(5, set_heartbeat, 120, cb, err) -pubnub.timeout(90, set_heartbeat, 60, cb, err) -pubnub.timeout(180, set_heartbeat, 30, cb, err) -pubnub.timeout(240, set_heartbeat, 15, cb, err) -pubnub.timeout(300, set_heartbeat, 8, cb, err) -# pubnub.timeout(360, pubnub.stop_heartbeat) - - -''' -import time -while True: - time.sleep(10) -''' - -pubnub.start() diff --git a/python/examples/here-now.py b/python/examples/here-now.py deleted file mode 100755 index 0eb89942..00000000 --- a/python/examples/here-now.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' - - -# Synchronous usage -print(pubnub.here_now(channel)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.here_now(channel, callback=callback, error=callback) diff --git a/python/examples/history.py b/python/examples/history.py deleted file mode 100755 index 8691a4b8..00000000 --- a/python/examples/history.py +++ /dev/null @@ -1,47 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'a' - -# Synchronous usage - -print(pubnub.history(channel, count=2)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.history(channel, count=2, callback=callback, error=callback) - -# Synchronous usage - -print(pubnub.history(channel, count=2, include_token=True)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.history(channel, count=2, include_token=True, callback=callback, error=callback) diff --git a/python/examples/pam_demo/demo.py b/python/examples/pam_demo/demo.py deleted file mode 100755 index 1c68787a..00000000 --- a/python/examples/pam_demo/demo.py +++ /dev/null @@ -1,126 +0,0 @@ -from gevent.monkey import patch_all -from pubnub import Pubnub -import random -import json - -patch_all() - -rand = str(random.randint(1, 99999999)) - - -def get_unique(s): - return 'str-' + rand + '-' + s - - -# public channel -# This is the channel all clients announce themselves on -- or more generally speaking, a channel you expect the client -# to "check-in" on to announce his state - -# channel_public = get_unique("channel_public") -channel_public = "channel_public" - -# server auth key -# Only the server has/knows about this auth token. It will be used to grant read on the "check-in" Presence channel - -# server_auth_token = get_unique("server_auth_token") -server_auth_token = "server_auth_token" - -# client auth key -# only clients will use this authey -- it does not provide presence channel read access - -# client_auth_token = get_unique("client_auth_token") -client_auth_token = "client_auth_token" - -# each client must have a unique id -- a UUID, for presence information/state to bind to - -# client uuid -client_uuid = get_unique("client_uuid") - -# server uuid -server_uuid = get_unique("server_uuid") - -# For the demo, we'll implement a SERVER called server, who is the authoritative 'admin' entity in the system -# We'll also implement a CLIENT called client, who is an arbitrary hardware device member of the network - -# Please swap out the default 'pam' demo keys with your own PAM-enabled keys - -# init server object -server = Pubnub(publish_key="pam", subscribe_key="pam", secret_key="pam", auth_key=server_auth_token, uuid=server_uuid) - -# init client object -client = Pubnub(publish_key="pam", subscribe_key="pam", auth_key=client_auth_token, uuid=client_uuid) - -# To access a Presence channel with PAM, its format is CHANNELNAME-pnpres - -# Grant permission to server auth keys -# grant r/w to public, and r/w public Presence (public-pnpres) - -print(server.grant(channel=channel_public, auth_key=server_auth_token, read=True, write=True)) -print(server.grant(channel=channel_public + '-pnpres', auth_key=server_auth_token, read=True, write=True)) - -# Grant permission to client auth keys -# grant r/w to public, and w-only access to public Presence (public-pnpres) -print(server.grant(channel=channel_public, auth_key=client_auth_token, read=True, write=False)) -print(server.grant(channel=channel_public + '-pnpres', auth_key=client_auth_token, read=False, write=False)) - - -# Now, we'll run it to watch it work as advertised... - -# Define some simple callabcks for the Server and Client - -def _server_message_callback(message, channel): - print("Server heard: " + json.dumps(message)) - - -def _client_message_callback(message, channel): - print("Client heard: " + json.dumps(message)) - - -def _client_error_callback(error, channel): - print("Client Error: " + error + " on channel " + channel) - print("TTL on grant expired, or token was invalid, or revoked." - " Client will now unsubscribe from this unauthorized channel.") - client.unsubscribe(channel=channel) - - -def _server_error_callback(error, channel): - print("Server Error: " + error + " on channel " + channel) - print("TTL on grant expired, or token was revoked. Server will now unsubscribe from this unauthorized channel.") - server.unsubscribe(channel=channel) - - -def _server_presence_callback(message, channel): - print(message) - if 'action' in message: - if message['action'] == 'join' and message['uuid'] == client_uuid: - print("Server can see that client with UUID " + message['uuid'] + " has a state of " + json.dumps( - message['data'])) - - -def _client_presence_callback(message, channel): - print(message) - if 'action' in message: - if message['action'] == 'join' and message['uuid'] == client_uuid: - print("Client can see that client with UUID " + message['uuid'] + " has a state of " + json.dumps( - message['data'])) - - -# server subscribes to public channel -server.subscribe(channels=channel_public, callback=_server_message_callback, error=_server_error_callback) - -# server subscribes to presence events on public channel -# presence() is a convienence method that subscribes to channel-pnpres with special logic for handling -# presence-event formatted messages - -# uncomment out to see server able to read on presence channel -server.presence(channel=channel_public, callback=_server_presence_callback, error=_server_error_callback) - -# now if the client tried to subscribe on the presence channel, and therefore, get state info -# he is explicitly denied! - -# uncomment out to see client not able to read on presence channel -client.presence(channel=channel_public, callback=_client_presence_callback, error=_client_error_callback) - -# client subscribes to public channel -client.subscribe(channels=channel_public, state={"myKey": get_unique("foo")}, callback=_client_message_callback, - error=_client_error_callback) diff --git a/python/examples/presence.py b/python/examples/presence.py deleted file mode 100755 index b55bb0be..00000000 --- a/python/examples/presence.py +++ /dev/null @@ -1,32 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on, daemon=False) - -channel = 'b' - - -# Asynchronous usage -def callback(message, channel): - print(message) - -pubnub.presence(channel, callback=callback) diff --git a/python/examples/publish.py b/python/examples/publish.py deleted file mode 100755 index a645ad67..00000000 --- a/python/examples/publish.py +++ /dev/null @@ -1,36 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on, pooling=False) -channel = 'hello_world' -message = 'Hello World !!!' - - -# Synchronous usage -print(pubnub.publish(channel, message)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.publish(channel, message, callback=callback, error=callback) diff --git a/python/examples/pubnub-console/pubnub-console b/python/examples/pubnub-console/pubnub-console deleted file mode 100644 index a1915edf..00000000 --- a/python/examples/pubnub-console/pubnub-console +++ /dev/null @@ -1,724 +0,0 @@ -## www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -## PubNub Real-time Push APIs and Notifications Framework -## Copyright (c) 2010 Stephen Blum -## http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub -import threading -from datetime import datetime - -from cmd2 import Cmd, make_option, options, Cmd2TestCase -import optparse -import json - -import atexit -import os -import readline -import rlcompleter - -import pygments -from pygments.lexers import JsonLexer -from pygments.formatters import TerminalFormatter - -lexer = JsonLexer() -formatter = TerminalFormatter() -def highlight(msg): - return pygments.highlight(msg, lexer, formatter) - - - -historyPath = os.path.expanduser("~/.pubnub_console_history") - - -def save_history(historyPath=historyPath): - import readline - readline.write_history_file(historyPath) - -if os.path.exists(historyPath): - readline.read_history_file(historyPath) - -atexit.register(save_history) - -of = sys.stdout - -color = Cmd() - -stop = None - -full_date = False - - -def stop_2(th): - th._Thread__stop() - - -def stop_3(th): - th._stop() - - -def print_console_2(of, message): - print >>of, message - - -def print_console_3(of, message): - of.write(message) - of.write("\n") - -print_console = None - -if type(sys.version_info) is tuple: - print_console = print_console_2 - stop = stop_2 -else: - if sys.version_info.major == 2: - print_console = print_console_2 - stop = stop_2 - else: - print_console = print_console_3 - stop = stop_3 - - -def get_date(): - if full_date is True: - return color.colorize(datetime.now().strftime( - '%Y-%m-%d %H:%M:%S'), "magenta") - else: - return color.colorize(datetime.now().strftime( - '%H:%M:%S'), "magenta") - -def print_ok_normal(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + color.colorize(str(msg), "green"))) - except UnicodeEncodeError as e: - print_console(of, (msg)) - - of.flush() - - -def print_error_normal(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + color.colorize(color.colorize( - str(msg), "red"), "bold"))) - except UnicodeEncodeError as e: - print_console(of, (msg)) - of.flush() - -def print_ok_pretty(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + highlight(json.dumps(msg, indent=2)))) - except UnicodeEncodeError as e: - print_console(of, (msg)) - - of.flush() - - -def print_error_pretty(msg, channel=None): - if msg is None: - return - chstr = "[" + color.colorize(get_date(), "magenta") + "] " - chstr += "[" + color.colorize("Channel : " + channel if channel is not None else "", "cyan") + "] " - try: - print_console(of, (chstr + color.colorize(color.colorize( - "ERROR: ", "red"), "bold") + - highlight(json.dumps(msg, indent=2)))) - except UnicodeEncodeError as e: - print_console(of, (msg)) - of.flush() - -print_ok = print_ok_pretty -print_error = print_error_pretty - - -class DefaultPubnub(object): - def handlerFunctionClosure(self, name): - def handlerFunction(*args, **kwargs): - print_error("Pubnub not initialized." + - "Use init command to initialize") - return handlerFunction - - def __getattr__(self, name): - return self.handlerFunctionClosure(name) - -pubnub = DefaultPubnub() - - -def kill_all_threads(): - for thread in threading.enumerate(): - if thread.isAlive(): - stop(thread) - - -def get_input(message, t=None): - while True: - try: - try: - command = raw_input(message) - except NameError: - command = input(message) - except KeyboardInterrupt: - return None - - command = command.strip() - - if command is None or len(command) == 0: - raise ValueError - - if t is not None and t == bool: - valid = ["True", "true", "1", 1, "y", "Y", "yes", "Yes", "YES"] - if command in valid: - return True - else: - return False - if t is not None: - command = t(command) - else: - command = eval("'" + command + "'") - - return command - except ValueError: - print_error("Invalid input : " + command) - - -def _publish_command_handler(channel, message, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - print_ok(pubnub.publish(channel, message, - _callback if async is True else None, - _error if async is True else None)) - - -def _subscribe_command_handler(channel): - - def _callback(r, ch): - print_ok(r, ch) - - def _error(r, ch=None): - print_error(r, ch if ch is not None else channel) - - def _disconnect(r): - print_ok("DISCONNECTED", r) - - def _reconnect(r): - print_ok("RECONNECTED", r) - - def _connect(r): - print_ok("CONNECTED", r) - - pubnub.subscribe(channel, _callback, _error, connect=_connect, - disconnect=_disconnect, reconnect=_reconnect) - - -def _unsubscribe_command_handler(channels): - - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - unsub_list = [] - current_channel_list = pubnub.get_channel_array() - - for channel in channels: - pubnub.unsubscribe(channel) - if (channel in current_channel_list): - unsub_list.append(channel) - - #pubnub.unsubscribe(channel + '-pnpres') - #if (channel + '-pnpres' in current_channel_list): - # unsub_list.append(channel + ' (Presence)') - - if len(unsub_list) > 0: - print_ok('Unsubscribed from : ' + str(unsub_list)) - else: - print_error('Not subscribed to : ' + str(channels)) - - -def _grant_command_handler(channel, auth_key, read, write, ttl, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.grant(channel, auth_key, - read, write, ttl, - _callback if async is True else None, - _error if async is True else None)) - - -def _revoke_command_handler(channel, auth_key, ttl, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.revoke(channel, auth_key, ttl, - _callback if async is True else None, - _error if async is True else None)) - - -def _audit_command_handler(channel, auth_key, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.audit(channel, auth_key, - _callback if async is True else None, - _error if async is True else None)) - - -def _history_command_handler(channel, count, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.history(channel, count, - _callback if async is True else None, - _error if async is True else None)) - - -def _here_now_command_handler(channel, async=False): - def _callback(r): - print_ok(r) - - def _error(r): - print_error(r) - - print_ok(pubnub.here_now(channel, _callback if async is True else None, - _error if async is True else None)) - - -def kill_all_threads(): - for thread in threading.enumerate(): - if thread.isAlive(): - stop(thread) - - -def get_channel_array(): - channels = pubnub.get_channel_array() - - for channel in channels: - if "-pnpres" in channel: - chname = channel.split("-pnpres")[0] - if chname not in channels: - continue - i = channels.index(chname) - channels[i] = channels[i] + color.colorize("(P)", "blue") - channels.remove(channel) - return channels - - -class DevConsole(Cmd): - def __init__(self): - Cmd.__init__(self) - global pubnub - self.intro = "For Help type ? or help . " + \ - "To quit/exit type exit" + "\n" + \ - "Commands can also be provided on command line while starting console (in quotes) ex. " + \ - "pubnub-console 'init -p demo -s demo'" - self.default_channel = None - self.async = False - pubnub = Pubnub("demo", "demo") - self.channel_truncation = 3 - self.prompt = self.get_prompt() - self.publish_key = "demo" - self.subscribe_key = "demo" - self.origin = "pubsub.pubnub.com" - self.auth_key = None - self.cipher_key = None - self.secret_key = "demo" - self.ssl = False - self.uuid = None - self.disable_pretty = False - - def get_channel_origin(self): - cho = "" - channels = get_channel_array() - channels_str = ",".join(channels) - sl = self.channel_truncation - if len(channels) > int(sl) and int(sl) > 0: - cho += ",".join(channels[:int(sl)]) + " " + str( - len(channels) - int(sl)) + " more..." - else: - cho += ",".join(channels) - - if len(channels) > 0: - cho = color.colorize(cho, "bold") + "@" - - origin = pubnub.get_origin().split("://")[1] - origin += color.colorize(" (SSL)", "green") if pubnub.get_origin( - ).split("://")[0] == "https" else "" - return " [" + cho + color.colorize(origin, "blue") + "] > " - - def get_prompt(self): - prompt = "[" + get_date() + "]" - - if self.default_channel is not None and len(self.default_channel) > 0: - prompt += " [default channel: " + color.colorize( - self.default_channel, "bold") + "]" - - prompt += self.get_channel_origin() - return prompt - - def precmd(self, line): - self.prompt = self.get_prompt() - return line - - #def emptyline(self): - # self.prompt = self.get_prompt() - - def cmdloop_with_keyboard_interrupt(self): - try: - self.cmdloop() - except KeyboardInterrupt as e: - pass - sys.stdout.write('\n') - kill_all_threads() - - @options([make_option('-p', '--publish-key', action="store", - default=None, help="Publish Key"), - make_option('-s', '--subscribe-key', action="store", - default=None, help="Subscribe Key"), - make_option('-k', '--secret-key', action="store", - default=None, help="cipher Key"), - make_option('-c', '--cipher-key', action="store", - default=None, help="Secret Key"), - make_option('-a', '--auth-key', action="store", - default=None, help="Auth Key"), - make_option('--ssl-on', dest='ssl', action='store_true', - default=False, help="SSL Enabled ?"), - make_option('-o', '--origin', action="store", - default=None, help="Origin"), - make_option('-u', '--uuid', action="store", - default=None, help="UUID"), - make_option('--disable-pretty-print', dest='disable_pretty', action='store_true', - default=False, help="Disable Pretty Print ?") - ]) - def do_init(self, command, opts): - global pubnub - global print_ok - global print_error - global print_ok_normal - global print_error_normal - global print_error_pretty - global print_ok_pretty - - self.publish_key = opts.publish_key if opts.publish_key is not None else self.publish_key - self.subscribe_key = opts.subscribe_key if opts.subscribe_key is not None else self.subscribe_key - self.secret_key = opts.secret_key if opts.secret_key is not None else self.secret_key - self.cipher_key = opts.cipher_key if opts.cipher_key is not None else self.cipher_key - self.auth_key = opts.auth_key if opts.auth_key is not None else self.auth_key - self.origin = opts.origin if opts.origin is not None else self.origin - self.uuid = opts.uuid if opts.uuid is not None else self.uuid - self.ssl = opts.ssl if opts.ssl is not None else self.ssl - self.disable_pretty = opts.disable_pretty if opts.disable_pretty is not None else self.disable_pretty - - pubnub = Pubnub(self.publish_key, - self.subscribe_key, - self.secret_key, - self.cipher_key, - self.auth_key, - self.ssl, - self.origin, - self.uuid) - self.prompt = self.get_prompt() - - if opts.disable_pretty is True: - print_ok = print_ok_normal - print_error = print_error_normal - else: - print_ok = print_ok_pretty - print_error = print_error_pretty - - def do_set_sync(self, command): - """unset_async - Unset Async mode""" - self.async = False - - def do_set_async(self, command): - """set_async - Set Async mode""" - self.async = True - - @options([make_option('-n', '--count', action="store", - default=3, help="Number of channels on prompt") - ]) - def do_set_channel_truncation(self, command, opts): - """set_channel_truncation - Set Channel Truncation""" - - self.channel_truncation = opts.count - - self.prompt = self.get_prompt() - - def do_unset_channel_truncation(self, command): - """unset_channel_truncation - Unset Channel Truncation""" - self.channel_truncation = 0 - self.prompt = self.get_prompt() - - def do_set_full_date(self, command): - global full_date - """do_set_full_date - Set Full Date""" - full_date = True - self.prompt = self.get_prompt() - - def do_unset_full_date(self, command): - global full_date - """do_unset_full_date - Unset Full Date""" - full_date = False - self.prompt = self.get_prompt() - - @options([make_option('-c', '--channel', - action="store", help="Default Channel") - ]) - def do_set_default_channel(self, command, opts): - - if opts.channel is None: - print_error("Missing channel") - return - self.default_channel = opts.channel - self.prompt = self.get_prompt() - - @options([make_option('-f', '--file', action="store", - default="./pubnub-console.log", help="Output file") - ]) - def do_set_output_file(self, command, opts): - global of - try: - of = file(opts.file, 'w+') - except IOError as e: - print_error("Could not set output file. " + e.reason) - - @options([make_option('-c', '--channel', action="store", - help="Channel for here now data") - ]) - def do_here_now(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts.channel is None: - print_error("Missing channel") - return - - _here_now_command_handler(opts.channel, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel for history data"), - make_option('-n', '--count', action="store", - default=5, help="Number of messages") - ]) - def do_get_history(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts.channel is None: - print_error("Missing channel") - return - - _history_command_handler(opts.channel, opts.count, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to publish") - ]) - def do_publish(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts.channel is None: - print_error("Missing channel") - return - - if command is None: - print_error("Missing message") - return - - try: - message = json.loads(str(command)) - except ValueError as ve: - message = str(command) - - _publish_command_handler(opts.channel, message, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to grant"), - make_option('-a', '--auth-key', dest="auth_key", - action="store", - help="Auth Key"), - make_option('-r', '--read-enabled', dest='read', - action='store_true', - default=False, help="Read ?"), - make_option('-w', '--write-enabled', dest='write', - action='store_true', - default=False, help="Write ?"), - make_option('-t', '--ttl', action="store", - default=5, help="TTL"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Grant on presence channel ?") - ]) - def do_grant(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - opts.auth_key = pubnub.auth_key \ - if opts.auth_key is None else opts.auth_key - - _grant_command_handler(opts.channel, opts.auth_key, - opts.read, opts.write, - opts.ttl, async=self.async) - - if opts.presence is True: - _grant_command_handler(opts.channel + '-pnpres', opts.auth_key, - opts.read, opts.write, - opts.ttl, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to revoke"), - make_option('-a', '--auth-key', dest="auth_key", action="store", - help="Auth Key"), - make_option('-t', '--ttl', action="store", - default=5, help="TTL"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Revoke on presence channel ?") - ]) - def do_revoke(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - opts.auth_key = pubnub.auth_key \ - if opts.auth_key is None else opts.auth_key - - _revoke_command_handler( - opts.channel, opts.auth_key, opts.ttl, async=self.async) - - if opts.presence is True: - _revoke_command_handler( - opts.channel + '-pnpres', opts.auth_key, - opts.ttl, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel on which to revoke"), - make_option('-a', '--auth-key', dest="auth_key", action="store", - help="Auth Key") - ]) - def do_audit(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - opts.auth_key = pubnub.auth_key \ - if opts.auth_key is None else opts.auth_key - - _audit_command_handler(opts.channel, opts.auth_key, async=self.async) - - @options([make_option('-c', '--channel', action="store", - help="Channel for unsubscribe"), - make_option('-a', '--all', action="store_true", dest="all", - default=False, help="Unsubscribe from all channels"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Unsubscribe from presence events ?") - ]) - def do_unsubscribe(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - - if (opts.all is True): - opts.channel = [] - chs = pubnub.get_channel_array() - for ch in chs: - if '-pnpres' not in ch: - opts.channel.append(ch) - elif opts.presence is True: - opts.channel.append(ch) - - if opts.channel is None: - print_error("Missing channel") - return - - if not isinstance(opts.channel, list): - ch = [] - ch.append(opts.channel) - opts.channel = ch - - channels = [] - if opts.presence is True and opts.all is False: - for c in opts.channel: - if '-pnpres' not in c: - channels.append(c + '-pnpres') - - for c in opts.channel: - channels.append(c) - - _unsubscribe_command_handler(channels) - self.prompt = self.get_prompt() - - @options([make_option('-c', '--channel', action="store", - help="Channel for subscribe"), - make_option('-g', '--get-channel-list', action="store_true", - dest="get", - default=False, help="Get susbcribed channel list"), - make_option('-p', '--presence', action="store_true", - dest="presence", - default=False, help="Presence events ?") - ]) - def do_subscribe(self, command, opts): - opts.channel = self.default_channel \ - if opts.channel is None else opts.channel - if opts is None: - print_error("Missing argument") - return - - if opts.channel is not None: - _subscribe_command_handler(opts.channel) - - if opts.presence is True: - _subscribe_command_handler(opts.channel + '-pnpres') - - if opts.get is True: - print_ok(get_channel_array()) - self.prompt = self.get_prompt() - - def do_exit(self, args): - kill_all_threads() - return -1 - - #def do_EOF(self, args): - # kill_all_threads() - # return self.do_exit(args) - - #def handler(self, signum, frame): - # kill_all_threads() - - -def main(): - app = DevConsole() - app.cmdloop_with_keyboard_interrupt() - -if __name__ == "__main__": - main() diff --git a/python/examples/pubnub-console/setup.py b/python/examples/pubnub-console/setup.py deleted file mode 100644 index 5ee5fd9e..00000000 --- a/python/examples/pubnub-console/setup.py +++ /dev/null @@ -1,27 +0,0 @@ -from setuptools import setup - -setup( - name='pubnub-console', - version='3.5.2', - description='PubNub Developer Console', - author='Stephen Blum', - author_email='support@pubnub.com', - url='http://pubnub.com', - scripts=['pubnub-console'], - license='MIT', - classifiers=( - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Programming Language :: Python', - 'License :: OSI Approved :: MIT License', - 'Operating System :: OS Independent', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Software Development :: Libraries :: Python Modules', - ), - install_requires=[ - 'pubnub>=3.5.2', - 'cmd2>=0.6.7', - 'pygments >= 1.6' - ], - zip_safe=False, -) diff --git a/python/examples/requirements.pip b/python/examples/requirements.pip deleted file mode 100644 index 738c6067..00000000 --- a/python/examples/requirements.pip +++ /dev/null @@ -1,3 +0,0 @@ -pycrypto==2.6.1 -cmd2==0.6.7 -requests==2.2.1 diff --git a/python/examples/revoke.py b/python/examples/revoke.py deleted file mode 100755 index 23bc110f..00000000 --- a/python/examples/revoke.py +++ /dev/null @@ -1,35 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'pam' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'pam' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'pam' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) -channel = 'hello_world' -authkey = "abcd" - -# Synchronous usage -print(pubnub.revoke(channel, authkey)) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.revoke(channel, authkey, callback=callback, error=callback) diff --git a/python/examples/start-console.sh b/python/examples/start-console.sh deleted file mode 100755 index a928cb33..00000000 --- a/python/examples/start-console.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -#!/bin/bash -e - -BASEDIR=. - -if [ ! -d "$BASEDIR/ve" ]; then - virtualenv -q $BASEDIR/ve --no-site-packages - $BASEDIR/ve/bin/activate - echo "Virtualenv created." -fi - -chmod 755 $BASEDIR/ve/bin/activate -$BASEDIR/ve/bin/activate - -if [ ! -f "$BASEDIR/ve/updated" -o $BASEDIR/requirements.pip -nt $BASEDIR/ve/updated ]; then - pip install -r $BASEDIR/requirements.pip -E $BASEDIR/ve - touch $BASEDIR/ve/updated - echo "Requirements installed." -fi - - - -if ! type "screen" > /dev/null; then - echo "[ERROR] Screen is not installed. Please install screen to use this utility ." - exit -fi -rm ./pubnub-console.log -touch ./pubnub-console.log -export PYTHONPATH=../.. -screen -X -S pubnub-console quit 2>&1 > /dev/null -OS="`uname`" -case $OS in - [dD]'arwin') - screen -c config_osx - ;; - *) screen -c config ;; -esac diff --git a/python/examples/state.py b/python/examples/state.py deleted file mode 100755 index f1c92c65..00000000 --- a/python/examples/state.py +++ /dev/null @@ -1,123 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -import time -from gevent import monkey -from pubnub import Pubnub - -monkey.patch_all() - - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - - -def log(a): - print(a) - - -pubnub.set_http_debug(log) - -# Synchronous usage -print(pubnub.state(channel='abcd', uuid='33c72389-1110-4312-9444-4dd24ade1d57', state={'a': 'b'})) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.state(channel='abcd', uuid='33c72389-1110-4312-9444-4dd24ade1d57', state={'a': 'b'}, callback=callback, - error=callback) - -time.sleep(5) - -# Synchronous usage -print(pubnub.state(channel='abcd', uuid='33c72389-1110-4312-9444-4dd24ade1d57')) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.state(channel='abcd', uuid='33c72389-1110-4312-9444-4dd24ade1d57', callback=callback, error=callback) - -time.sleep(5) - -# Synchronous usage -print(pubnub.state(channel='abcd')) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.state(channel='abcd', callback=callback, error=callback) - -time.sleep(5) - -# Synchronous usage -print(pubnub.state(channel='abcd', state={'a': 'b'})) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.state(channel='abcd', state={'a': 'b'}, callback=callback, error=callback) - -time.sleep(5) - -# Synchronous usage -print(pubnub.state(channel='abcd')) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.state(channel='abcd', callback=callback, error=callback) - -time.sleep(5) - -# Synchronous usage -print(pubnub.state(channel='abcd')) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.state(channel='abcd', callback=callback, error=callback) diff --git a/python/examples/subscribe.py b/python/examples/subscribe.py deleted file mode 100755 index 8ee00998..00000000 --- a/python/examples/subscribe.py +++ /dev/null @@ -1,53 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -import time -from pubnub import Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on, daemon=True) - -channel = 'a' - - -# Asynchronous usage -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channels=channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) - -while True: - time.sleep(10) diff --git a/python/examples/subscribe_group.py b/python/examples/subscribe_group.py deleted file mode 100755 index b6228f66..00000000 --- a/python/examples/subscribe_group.py +++ /dev/null @@ -1,69 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys - -from pubnub import Pubnub as Pubnub - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or 'abcd' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - -channel = 'ab' - - -# Asynchronous usage - -def callback_abc(message, channel, real_channel): - print(str(message) + ' , ' + channel + ', ' + real_channel) - pubnub.unsubscribe_group(channel_group='abc') - # pubnub.stop() - - -def callback_d(message, channel): - print(str(message) + ' , ' + channel) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect_abc(message): - print("CONNECTED " + str(message)) - - -def connect_d(message): - print("CONNECTED " + str(message)) - pubnub.unsubscribe(channel='d') - - -def reconnect(message): - print("RECONNECTED " + str(message)) - - -def disconnect(message): - print("DISCONNECTED " + str(message)) - - -print(pubnub.channel_group_add_channel(channel_group='abc', channel="b")) - -pubnub.subscribe_group(channel_groups='abc', callback=callback_abc, error=error, - connect=connect_abc, reconnect=reconnect, disconnect=disconnect) - -pubnub.subscribe(channels='d', callback=callback_d, error=error, - connect=connect_d, reconnect=reconnect, disconnect=disconnect) - -pubnub.start() diff --git a/python/examples/where-now.py b/python/examples/where-now.py deleted file mode 100755 index dd18a67e..00000000 --- a/python/examples/where-now.py +++ /dev/null @@ -1,38 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import sys -from gevent import monkey -from pubnub import Pubnub - -monkey.patch_all() - -publish_key = len(sys.argv) > 1 and sys.argv[1] or 'demo' -subscribe_key = len(sys.argv) > 2 and sys.argv[2] or 'demo' -secret_key = len(sys.argv) > 3 and sys.argv[3] or 'demo' -cipher_key = len(sys.argv) > 4 and sys.argv[4] or '' -ssl_on = len(sys.argv) > 5 and bool(sys.argv[5]) or False - -# ----------------------------------------------------------------------- -# Initiate Pubnub State -# ----------------------------------------------------------------------- -pubnub = Pubnub(publish_key=publish_key, subscribe_key=subscribe_key, - secret_key=secret_key, cipher_key=cipher_key, ssl_on=ssl_on) - -# Synchronous usage -print(pubnub.where_now(uuid='33c72389-1110-4312-9444-4dd24ade1d57')) - - -# Asynchronous usage - - -def callback(message): - print(message) - - -pubnub.where_now(uuid='33c72389-1110-4312-9444-4dd24ade1d57', callback=callback, error=callback) diff --git a/python/examples/wildcard_subscribe.py b/python/examples/wildcard_subscribe.py deleted file mode 100755 index b3e542ee..00000000 --- a/python/examples/wildcard_subscribe.py +++ /dev/null @@ -1,96 +0,0 @@ -from gevent import monkey -from pubnub import Pubnub - -monkey.patch_all() - - -pubnub = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", ssl_on=False) - - -# Wildcard Subscribe without presence - -def a(): - channel_wc = "a.*" - channel = "a.b" - - def callback(message1, channel1, real_channel=None): - print(channel1 + " : " + real_channel + " : " + str(message1)) - - def error(message): - print("ERROR : " + str(message)) - - def connect(channel1=None): - print("Connect on " + channel1) - print(pubnub.publish(channel=channel, message="a")) - - def disconnect(channel1=None): - print("Disconnect on " + channel1) - - def reconnect(channel1=None): - print("Reconnect on " + channel1) - - pubnub.subscribe(channels=channel_wc, callback=callback, error=callback, - connect=connect, disconnect=disconnect, reconnect=reconnect) - - -# Wildcard Subscribe with presence - -def b(): - channel_wc = "b.*" - channel = "b.c" - - def callback(message1, channel1, real_channel=None): - print(channel1 + " : " + real_channel + " : " + str(message1)) - - def error(message): - print("ERROR : " + str(message)) - - def presence(message1, channel1, real_channel=None): - print(channel1 + " : " + real_channel + " : " + str(message1)) - - def connect(channel1=None): - print("Connect on " + channel1) - print(pubnub.publish(channel=channel, message="b")) - - def disconnect(channel1=None): - print("Disconnect on " + channel1) - - def reconnect(channel1=None): - print("Reconnect on " + channel1) - - pubnub.subscribe(channels=channel_wc, callback=callback, error=callback, - connect=connect, disconnect=disconnect, reconnect=reconnect, presence=presence) - - -# Wildcard Subscribe and unsubscribe - -def c(): - channel_wc = "c.*" - channel = "c.d" - - def callback(message1, channel1, real_channel=None): - print(channel1 + " : " + real_channel + " : " + str(message1)) - pubnub.unsubscribe(channel="c.*") - print(pubnub.publish(channel=channel, message="c1")) - - def error(message): - print("ERROR : " + str(message)) - - def connect(channel1=None): - print("Connect on " + channel1) - print(pubnub.publish(channel=channel, message="c")) - - def disconnect(channel1=None): - print("Disconnect on " + channel1) - - def reconnect(channel1=None): - print("Reconnect on " + channel1) - - pubnub.subscribe(channels=channel_wc, callback=callback, error=callback, - connect=connect, disconnect=disconnect, reconnect=reconnect) - - -a() -b() -c() diff --git a/python/migration.md b/python/migration.md deleted file mode 100644 index 61cf203a..00000000 --- a/python/migration.md +++ /dev/null @@ -1,205 +0,0 @@ -## Contact support@pubnub.com for all questions - -#### [PubNub](http://www.pubnub.com) Real-time Data Network -##### Standalone Python Migration - -#### Init - -``` - -# Pre 3.5: -pubnub = Pubnub( - "demo", ## PUBLISH_KEY - "demo", ## SUBSCRIBE_KEY - False ## SSL_ON? -) - -# New in 3.5+ -pubnub = Pubnub(publish_key="demo", subscribe_key="demo", ssl_on=False) - -``` - -#### PUBLISH - -``` -channel = 'hello_world' -message = 'Hello World !!!' - -# Pre 3.5: -info = pubnub.publish({ - 'channel' : channel, - 'message' : message -}) -print(info) - -# New in 3.5+ - -# Synchronous usage -print pubnub.publish(channel='hello_world', message='Hello World !!!') - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.publish(channel, message, callback=callback, error=callback) - -``` - - -#### SUBSCRIBE -Pre 3.5.x, subscribe was blocking and would only be terminated via a false return from the callback. In our latest version of the SDK, subscribe is asyncronous, and because of this, usage is a bit different, but the experience is more like our other async SDKs. - -``` - -# Listen for Messages - -channel = 'hello_world' - -# Pre 3.5: -# Listen for Messages *BLOCKING* -def receive(message) : - print(message) - return True - -pubnub.subscribe({ - 'channel' : channel, - 'callback' : receive -}) - - -# New in 3.5+ - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - -def connect(message): - print("CONNECTED") - - -def reconnect(message): - print("RECONNECTED") - - -def disconnect(message): - print("DISCONNECTED") - - -pubnub.subscribe(channel, callback=callback, error=callback, - connect=connect, reconnect=reconnect, disconnect=disconnect) -``` - -#### Unsubscribe -Once subscribed, you can easily, gracefully, unsubscribe: - -``` -# Pre 3.5: -# - -# New in 3.5+ - -pubnub.unsubscribe(channel='hello_world') -``` - -#### PRESENCE - -``` - - -channel = 'hello_world' - -# Pre 3.5: -def pres_event(message) : - print(message) - return True - -pubnub.presence({ - 'channel' : channel, - 'callback' : receive -}) - - -# New in 3.5+ - -# Listen for Presence Event Messages - -def callback(message, channel): - print(message) - - -def error(message): - print("ERROR : " + str(message)) - - - -pubnub.presence(channel, callback=callback, error=callback) -``` - -#### HERE_NOW - -``` - -# Pre 3.5: -# Get info on who is here right now! - -here_now = pubnub.here_now({ - 'channel' : 'hello_world', -}) - -print(here_now['occupancy']) -print(here_now['uuids']) - - -# New in 3.5+ - -# Get info on who is here right now! - -channel = 'hello_world' - -# Synchronous usage -print pubnub.here_now(channel) - - -# Asynchronous usage - -def callback(message): - print(message) - -pubnub.here_now(channel, callback=callback, error=callback) -``` - -#### HISTORY - -``` - -# Pre 3.5: -# Load Previously Published Messages -history = pubnub.detailedHistory({ - 'channel' : 'my_channel', - 'end' : my_end_time_token, # Optional - 'start' : my_start_time_token, # Optional - 'count' : num_of_msgs_to_return # Optional, default is 100 -}) -print(history) - -# New in 3.5+ - -# Synchronous usage - -print pubnub.history(channel, count=2) - -# Asynchronous usage - - -def callback(message): - print(message) - -pubnub.history(channel, count=2, callback=callback, error=callback) -``` - -## Contact support@pubnub.com for all questions diff --git a/python/tests/test_cg.py b/python/tests/test_cg.py deleted file mode 100755 index 154611f5..00000000 --- a/python/tests/test_cg.py +++ /dev/null @@ -1,96 +0,0 @@ -from pubnub import Pubnub -import random - -pubnub = Pubnub("demo", "demo") -pubnub.set_u(True) - - -def rand_str(s): - return str(s) + '-' + str(random.randint(1, 100000000000)) - - -def test_1(): - channel = rand_str('channel') - channel2 = rand_str('channel') - channel_group = rand_str('group') - channel_group2 = rand_str('group') - namespace = rand_str('ns') - - resp = pubnub.channel_group_add_channel(channel_group=namespace + ':' + channel_group, channel=channel) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_add_channel(channel_group=namespace + ':' + channel_group, channel=channel2) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_add_channel(channel_group=namespace + ':' + channel_group2, channel=channel) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_add_channel(channel_group=namespace + ':' + channel_group2, channel=channel2) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_list_channels(channel_group=namespace + ':' + channel_group) - assert channel in resp['payload']['channels'] - assert channel2 in resp['payload']['channels'] - assert len(resp['payload']['channels']) == 2 - - resp = pubnub.channel_group_remove_channel(channel_group=namespace + ':' + channel_group, channel=channel2) - print(resp) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_list_channels(channel_group=namespace + ':' + channel_group) - print(resp) - assert channel in resp['payload']['channels'] - assert len(resp['payload']['channels']) == 1 - - resp = pubnub.channel_group_list_channels(channel_group=namespace + ':' + channel_group2) - assert channel in resp['payload']['channels'] - assert channel2 in resp['payload']['channels'] - assert len(resp['payload']['channels']) == 2 - - resp = pubnub.channel_group_remove_channel(channel_group=namespace + ':' + channel_group2, channel=channel2) - print(resp) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_list_channels(channel_group=namespace + ':' + channel_group2) - print(resp) - assert channel in resp['payload']['channels'] - assert len(resp['payload']['channels']) == 1 - - resp = pubnub.channel_group_list_groups(namespace=namespace) - assert channel_group in resp['payload']['groups'] - assert channel_group2 in resp['payload']['groups'] - assert len(resp['payload']['groups']) == 2 - - resp = pubnub.channel_group_remove_group(channel_group=namespace + ':' + channel_group2) - print(resp) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_list_groups(namespace=namespace) - assert channel_group in resp['payload']['groups'] - assert len(resp['payload']['groups']) == 1 - - resp = pubnub.channel_group_list_namespaces() - assert namespace in resp['payload']['namespaces'] - - resp = pubnub.channel_group_remove_namespace(namespace=namespace) - print(resp) - assert resp['status'] == 200 - assert resp['message'] == 'OK' - assert resp['error'] == False - - resp = pubnub.channel_group_list_namespaces() - assert namespace not in resp['payload']['namespaces'] diff --git a/python/tests/test_grant.py b/python/tests/test_grant.py deleted file mode 100755 index 1789d603..00000000 --- a/python/tests/test_grant.py +++ /dev/null @@ -1,90 +0,0 @@ -from pubnub import Pubnub -import time - -subkey = "sub-c-9aeec0d4-cdf4-11e5-bcee-0619f8945a4f" -pubkey = "pub-c-b3fdf8fc-4516-4ab2-8836-6fb22ba7870d" -secretkey = "sec-c-ZDQwNTUwMDctZDViYi00MzhlLTg2NTctYjViZDcwNTA5Zjhj" -pubnub = Pubnub(pubkey, subkey) -pubnub_pam = Pubnub(pubkey, subkey, secretkey) -pam_timeout = 10 - - -# Grant permission read true, write true, on channel ( Sync Mode ) -def test_1(): - resp = pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, - write=True, ttl=1) - print(resp) - assert resp['message'] == 'Success' - assert resp['payload'] == { - 'auths': {'abcd': {'r': 1, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1 - } - - -# Grant permission read false, write false, on channel ( Sync Mode ) -def test_2(): - resp = pubnub_pam.grant(channel="abcd", auth_key="abcd", read=False, - write=False, ttl=1) - assert resp['message'] == 'Success' - assert resp['payload'] == { - 'auths': {'abcd': {'r': 0, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1 - } - - -# Grant permission read True, write false, on channel ( Sync Mode ) -def test_3(): - resp = pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, - write=False, ttl=1) - assert resp['message'] == 'Success' - assert resp['payload'] == { - 'auths': {'abcd': {'r': 1, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1 - } - - -# Grant permission read False, write True, on channel ( Sync Mode ) -def test_4(): - resp = pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, - write=False, ttl=1) - assert resp['message'] == 'Success' - assert resp['payload'] == { - 'auths': {'abcd': {'r': 1, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 1 - } - - -# Grant permission read False, write True, on channel ( Sync Mode ), TTL 10 -def test_5(): - resp = pubnub_pam.grant(channel="abcd", auth_key="abcd", read=True, - write=False, ttl=10) - assert resp['message'] == 'Success' - assert resp['payload'] == { - 'auths': {'abcd': {'r': 1, 'w': 0, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': 'abcd', 'ttl': 10 - } - - -# Complete flow , try publish on forbidden channel, grant permission to -# auth key and try again. ( Sync Mode) -def test_8(): - channel = "test_8-" + str(time.time()) - message = "Hello World" - auth_key = "auth-" + channel - pubnub.set_auth_key(auth_key) - resp = pubnub_pam.grant(channel=channel, read=True, write=True, - auth_key=auth_key, ttl=10) - assert resp == { - 'message': 'Success', - 'payload': {'auths': {auth_key: {'r': 1, 'w': 1, 'm': 0}}, - 'subscribe_key': subkey, - 'level': 'user', 'channel': channel, 'ttl': 10} - } - time.sleep(pam_timeout) - resp = pubnub.publish(channel=channel, message=message) - assert resp[0] == 1 diff --git a/python/tests/test_history.py b/python/tests/test_history.py deleted file mode 100755 index 64ee7f00..00000000 --- a/python/tests/test_history.py +++ /dev/null @@ -1,65 +0,0 @@ -from pubnub import Pubnub -import time -import random -from nose.tools import with_setup - - -pubnub = Pubnub("ds", "ds") -pubnub_enc = Pubnub(publish_key="ds", subscribe_key="ds", cipher_key="enigma") -pubnub_pam = Pubnub(publish_key="pam", subscribe_key="pam", secret_key="pam") - - -def rand(msg): - return "rand-" + str(random.random()) + "-" + msg - -channel = rand("channel") -channel_enc = rand("channel_enc") -channel_pam = rand("channel_pam") - -messages = [] - - -def setup_func(): - pubnub_pam.grant(channel=channel_pam, read=True, write=True, ttl=144000) - - for i in range(0, 20): - msg = rand("message-" + str(i)) - messages.append(msg) - print(pubnub.publish(channel=channel, message=msg)) - # Fails with Python 3 - # print(pubnub_enc.publish(channel=channel_enc, message=msg)) - print(pubnub_pam.publish(channel=channel_pam, message=msg)) - - -@with_setup(setup_func) -def test_1(): - time.sleep(3) - hresp = pubnub.history(channel=channel, count=20) - # Fails with Python 3 - # hresp2 = pubnub_enc.history(channel=channel_enc, count=20) - hresp3 = pubnub_pam.history(channel=channel_pam, count=20) - hresp4 = pubnub_pam.history(channel=channel_pam + "no_rw", count=20) - assert hresp[0] == messages - # Fails with Python 3 - # assert hresp2[0] == messages - assert hresp3[0] == messages - assert hresp4['message'] == 'Forbidden' - assert channel_pam + "no_rw" in hresp4['payload']['channels'] - - -def test_2(): - time.sleep(3) - hresp = pubnub.history(channel=channel, count=20, include_token=True) - # Fails with Python 3 - # hresp2 = pubnub_enc.history(channel=channel_enc, count=20, include_token=True) - hresp3 = pubnub_pam.history(channel=channel_pam, count=20, include_token=True) - hresp4 = pubnub_pam.history(channel=channel_pam + "no_rw", count=20, include_token=True) - assert len(hresp[0]) == len(messages) - assert hresp[0][0]['timetoken'] - # Fails with Python 3 - # assert len(hresp2[0]) == len(messages) - # assert hresp2[0][0]['timetoken'] - assert len(hresp3[0]) == len(messages) - assert hresp3[0][0]['timetoken'] - assert hresp4['message'] == 'Forbidden' - assert channel_pam + "no_rw" in hresp4['payload']['channels'] diff --git a/python/tests/test_wildcard.py b/python/tests/test_wildcard.py deleted file mode 100755 index b563975e..00000000 --- a/python/tests/test_wildcard.py +++ /dev/null @@ -1,360 +0,0 @@ -# www.pubnub.com - PubNub Real-time push service in the cloud. -# coding=utf8 - -# PubNub Real-time Push APIs and Notifications Framework -# Copyright (c) 2010 Stephen Blum -# http://www.pubnub.com/ - - -import time -import random -from pubnub import Pubnub -from inspect import currentframe, getouterframes -from gevent import monkey - -monkey.patch_all() - - -def get_line(): - # print getouterframes(currentframe())[3] - return getouterframes(currentframe())[2][2] - - -DELAY = 5 - -RESULTS = {} - - -def check_tests(): - for i in RESULTS: - test = RESULTS[i] - if test['done'] is False: - if test['expect'] == test['passed']: - green(i + " PASSED " + str(test['passed'])) - else: - red(i + " FAILED " + str(test['failed'])) - test['done'] = True - - -def init(conf, name, expect): - # check_tests() - print("\n\n") - RESULTS[name + conf] = {'passed': 0, 'failed': 0, 'expect': 0, 'done': False, 'conf': conf} - RESULTS[name + conf]['expect'] = expect - - -def get_random(): - return str(random.randint(1, 99999)) - - -def red(name): - print('\033[1;31m' + name + '\033[1;m') - - -def green(name): - print('\033[1;92m' + name + '\033[1;m') - - -def test(cond, desc=None, test_name=None, conf=None): - if (cond): - green("[" + test_name + " " + str(conf) + " ""][" + str(get_line()) + "] PASS : " + str(desc)) - RESULTS[test_name + conf]['passed'] = RESULTS[test_name + str(conf)]['passed'] + 1 - else: - red("[" + test_name + " " + str(conf) + " ""][" + str(get_line()) + "] FAIL : " + str(desc)) - RESULTS[test_name + conf]['failed'] = RESULTS[test_name + str(conf)]['failed'] + 1 - # exit(0) - - -def run_tests(tests): - for test in tests: - if len(test) > 4: - test[1](test[2], test[3], test[0], test[4]) - else: - test[1](test[2], test[3], test[0]) - time.sleep(DELAY) - check_tests() - - -def test_1(pubnub, pubnub2, conf=None, msg=None): - init(conf, "test_1", 6) - r = get_random() - channel_wc = r + "-" + "test_1-ab.*" - message = msg if msg is not None else (r + "-" + "test_1_hi") - channel = r + "-" + "test_1-ab.d" - - # Asynchronous usage - def callback(message1, channel1, real_channel=None): - # print(str(message1) + ' : ' + str(channel1) + ' : ' + str(real_channel)) - test(message1 == str(message, 'utf-8'), "message received", "test_1", conf) - test(channel1 == channel_wc, "Channel == wildcard channel", "test_1", conf) - test(real_channel == channel, "Real channel == publish channel", "test_1", conf) - - def error(message): - print("ERROR : " + str(message)) - - def connect(channel1=None): - test(True, "Connect Called", "test_1", conf) - test(channel1 == channel_wc, "Channel param in Connect same as wildcard", "test_1", conf) - - def _callback(message): - test(message[0] == 1, "Publish Successful", "test_1", conf) - - def _error(message): - test(False, "Publish Successful", "test_1", conf) - - pubnub.publish(channel=channel, message=message, callback=_callback, error=_error) - - pubnub.subscribe(channels=channel_wc, callback=callback, error=callback, connect=connect) - - -def test_2(pubnub, pubnub2, conf=None, msg=None): - init(conf, "test_2", 8) - r = get_random() - channel_wc = r + "-" + "test_2-ab.*" - message = msg if msg is not None else (r + "-" + "test_2_hi") - channel = r + "-" + "test_2-ab.d" - - # Asynchronous usage - def callback(message1, channel1, real_channel=None): - # print(str(message1) + ' : ' + str(channel1) + ' : ' + str(real_channel)) - test(message1 == str(message, 'utf-8'), "message received", "test_2", conf) - test(channel1 == channel_wc, "Channel == wildcard channel", "test_2", conf) - test(real_channel == channel, "Real channel == publish channel", "test_2", conf) - - def error(message): - print("ERROR : " + str(message)) - - def presence(message, channel1, real_channel=None): - if (pubnub.uuid == message['uuid']): - test(channel_wc == real_channel, "On pubnub subscribe presence event as wildcard as real channel", "test_2", - conf) - elif (pubnub2.uuid == message['uuid']): - test(channel == real_channel, "On pubnub2 subscribe presence event as channel as real channel", "test_2", - conf) - else: - test(False, "Wrong presence event", "test_2", conf) - - def connect(channel1=None): - # print(channel1) - test(True, "Connect Called", "test_2", conf) - test(channel1 == channel_wc, "Channel param in Connect same as wildcard", "test_2", conf) - - def _callback(message): - test(message[0] == 1, "Publish Successful", "test_2", conf) - - def _error(message): - test(False, "Publish Successful", "test_2", conf) - - pubnub.publish(channel=channel, message=message, callback=_callback, error=_error) - - def _callback(message, channel1): - pass - - def _error(message): - test(False, "Error in subscribe", "test_2", conf) - - pubnub2.subscribe(channels=channel, callback=_callback, error=_error) - - pubnub.subscribe(channels=channel_wc, callback=callback, error=callback, connect=connect, presence=presence) - - -def test_3(pubnub, pubnub2, conf=None, msg=None): - init(conf, "test_3", 6) - - r = get_random() - channel_wc = r + "-" + "test_3-ab.*" - message = msg if msg is not None else (r + "-" + "test_3_hi") - channel = r + "-" + "test_3-ab.d" - - # Asynchronous usage - def callback(message1, channel1, real_channel=None): - if 'action' in message1: - test(False, "Presence event received without presence callback", "test_3", conf) - return - - test(message1 == str(message, 'utf-8'), "message received", "test_3", conf) - test(channel1 == channel_wc, "Channel == wildcard channel", "test_3", conf) - test(real_channel == channel, "Real channel == publish channel", "test_3", conf) - - def error(message): - print("ERROR : " + str(message)) - - def connect(channel1=None): - # print(channel1) - test(True, "Connect Called", "test_3", conf) - test(channel1 == channel_wc, "Channel param in Connect same as wildcard", "test_3", conf) - - def _callback(message): - test(message[0] == 1, "Publish Successful", "test_3", conf) - - def _error(message): - test(False, "Publish Successful", "test_3", conf) - - pubnub.publish(channel=channel, message=message, callback=_callback, error=_error) - - def _callback(message, channel1): - pass - - def _error(message): - test(False, "Error in subscribe", "test_3", conf) - - pubnub2.subscribe(channels=channel, callback=_callback, error=_error) - - pubnub.subscribe(channels=channel_wc, callback=callback, error=callback, connect=connect) - - -def test_4(pubnub, pubnub2, conf=None, msg=None): - init(conf, "test_4", 18) - - r = get_random() - channel_wc = r + "-" + "test_4-ab.*" - channel_group = r + "-" + "test_4_group" - channel_g = r + "-" + "test_4_group_channel" - message = msg if msg is not None else (r + "-" + "test_4_hi") - channel = r + "-" + "test_4-ab.d" - channel_n = r + "-" + "test_4-a" - - def _callback(resp): - # Asynchronous usage - def callback_wc(message1, channel1, real_channel=None): - test(message1 == str(message, 'utf-8'), "message received", "test_4", conf) - test(channel1 == channel_wc, "Channel == wildcard channel", "test_4", conf) - test(real_channel == channel, "Real channel == publish channel", "test_4", conf) - - def callback_group(message1, channel1, real_channel=None): - test(message1 == str(message, 'utf-8'), "message received", "test_4", conf) - test(channel1 == channel_group, "Channel == group", "test_4", conf) - test(real_channel == channel_g, "Real channel == publish channel", "test_4", conf) - - def callback_n(message1, channel1, real_channel=None): - test(message1 == str(message, 'utf-8'), "message received", "test_4", conf) - test(channel1 == channel_n, "Channel == channel", "test_4", conf) - test(real_channel == channel_n, "Real channel == publish channel", "test_4", conf) - - def error(message): - print("ERROR : " + str(message)) - - def connect_wc(channel1=None): - test(True, "Connect Called", "test_4", conf) - test(channel1 == channel_wc, "Channel param in Connect same as wildcard", "test_4", conf) - - def _callback(message): - test(message[0] == 1, "Publish Successful", "test_4", conf) - - def _error(message): - test(False, "Publish Successful", "test_4", conf) - - pubnub.publish(channel=channel, message=message, callback=_callback, error=_error) - - def connect_group(channel1=None): - # print(channel1) - test(True, "Connect Called", "test_4", conf) - test(channel1 == channel_group, "Channel param in Connect same as channel_group", "test_4", conf) - - def _callback(message): - test(message[0] == 1, "Publish Successful", "test_4", conf) - - def _error(message): - test(False, "Publish Successful", "test_4", conf) - - pubnub.publish(channel=channel_g, message=message, callback=_callback, error=_error) - - def connect_n(channel1=None): - # print(channel1) - test(True, "Connect Called", "test_4", conf) - test(channel1 == channel_n, "Channel param in Connect same as channel_n", "test_4", conf) - - def _callback(message): - test(message[0] == 1, "Publish Successful", "test_4", conf) - - def _error(message): - test(False, "Publish Successful", "test_4", conf) - - pubnub.publish(channel=channel_n, message=message, callback=_callback, error=_error) - - pubnub.subscribe(channels=channel_wc, callback=callback_wc, error=error, connect=connect_wc) - - pubnub.subscribe(channels=channel_n, callback=callback_n, error=error, connect=connect_n) - - pubnub.subscribe_group(channel_groups=[channel_group], callback=callback_group, error=error, - connect=connect_group) - - def _error(message): - test(False, "Channel Group Creation failed") - - pubnub.channel_group_add_channel(channel_group=channel_group, channel=channel_g, callback=_callback, error=_error) - - -pubnub = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", ssl_on=False) - -pubnub2 = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", ssl_on=False) - -pubnub_ssl = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", ssl_on=True) - -pubnub_ssl_2 = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", ssl_on=True) - -pubnub_enc = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", cipher_key="enigma", ssl_on=False) - -pubnub_enc_2 = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", cipher_key="enigma", ssl_on=False, daemon=False) - -pubnub_enc_ssl = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", cipher_key="enigma", ssl_on=False) - -pubnub_enc_ssl_2 = Pubnub(publish_key="ds", subscribe_key="ds", - secret_key="ds", cipher_key="enigma", ssl_on=False, daemon=False) - -# run_tests([ ("[EMOJI][ENC]", test_4, pubnub_enc, pubnub_enc_2, "😀")]) - - -run_tests([ - ("", test_1, pubnub, pubnub2), - ("[SSL]", test_1, pubnub_ssl, pubnub_ssl_2), - ("[ENC]", test_1, pubnub_enc, pubnub_enc_2), - ("[SSL][ENC]", test_1, pubnub_enc_ssl, pubnub_enc_ssl_2), - ("", test_2, pubnub, pubnub2), - ("[SSL]", test_2, pubnub_ssl, pubnub_ssl_2), - ("[ENC]", test_2, pubnub_enc, pubnub_enc_2), - ("[SSL][ENC]", test_2, pubnub_enc_ssl, pubnub_enc_ssl_2), - ("", test_3, pubnub, pubnub2), - ("[SSL]", test_3, pubnub_ssl, pubnub_ssl_2), - ("[ENC]", test_3, pubnub_enc, pubnub_enc_2), - ("[SSL][ENC]", test_3, pubnub_enc_ssl, pubnub_enc_ssl_2), - ("", test_3, pubnub, pubnub2), - ("[SSL]", test_3, pubnub_ssl, pubnub_ssl_2), - ("[ENC]", test_3, pubnub_enc, pubnub_enc_2), - ("[SSL][ENC]", test_3, pubnub_enc_ssl, pubnub_enc_ssl_2), - ("", test_4, pubnub, pubnub2), - ("[SSL]", test_4, pubnub_ssl, pubnub_ssl_2), - ("[ENC]", test_4, pubnub_enc, pubnub_enc_2), - ("[SSL][ENC]", test_4, pubnub_enc_ssl, pubnub_enc_ssl_2), - ("[EMOJI]", test_1, pubnub, pubnub2, "😀"), - ("[SSL][EMOJI]", test_1, pubnub_ssl, pubnub_ssl_2, "😀"), - ("[ENC][EMOJI]", test_1, pubnub_enc, pubnub_enc_2, "😀"), - ("[SSL][ENC][EMOJI]", test_1, pubnub_enc_ssl, pubnub_enc_ssl_2, "😀"), - ("[EMOJI]", test_2, pubnub, pubnub2, "😀"), - ("[SSL][EMOJI]", test_2, pubnub_ssl, pubnub_ssl_2, "😀"), - ("[ENC][EMOJI]", test_2, pubnub_enc, pubnub_enc_2, "😀"), - ("[SSL][ENC][EMOJI]", test_2, pubnub_enc_ssl, pubnub_enc_ssl_2, "😀"), - ("[EMOJI]", test_3, pubnub, pubnub2, "😀"), - ("[SSL][EMOJI]", test_3, pubnub_ssl, pubnub_ssl_2, "😀"), - ("[ENC][EMOJI]", test_3, pubnub_enc, pubnub_enc_2, "😀"), - ("[SSL][ENC][EMOJI]", test_3, pubnub_enc_ssl, pubnub_enc_ssl_2, "😀"), - ("[EMOJI]", test_3, pubnub, pubnub2, "😀"), - ("[SSL][EMOJI]", test_3, pubnub_ssl, pubnub_ssl_2, "😀"), - ("[ENC][EMOJI]", test_3, pubnub_enc, pubnub_enc_2, "😀"), - ("[SSL][ENC][EMOJI]", test_3, pubnub_enc_ssl, pubnub_enc_ssl_2, "😀"), - ("[EMOJI]", test_3, pubnub, pubnub2, "😀"), - ("[SSL][EMOJI]", test_3, pubnub_ssl, pubnub_ssl_2, "😀"), - ("[ENC][EMOJI]", test_3, pubnub_enc, pubnub_enc_2, "😀"), - ("[SSL][ENC][EMOJI]", test_3, pubnub_enc_ssl, pubnub_enc_ssl_2, "😀"), - ("[EMOJI]", test_4, pubnub, pubnub2, "😀"), - ("[SSL][EMOJI]", test_4, pubnub_ssl, pubnub_ssl_2, "😀"), - ("[ENC][EMOJI]", test_4, pubnub_enc, pubnub_enc_2, "😀"), - ("[SSL][ENC][EMOJI]", test_4, pubnub_enc_ssl, pubnub_enc_ssl_2, "😀") -]) diff --git a/run-tests.sh b/run-tests.sh deleted file mode 100755 index 18034fba..00000000 --- a/run-tests.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -set -ev - -nosetests python/tests/test_cg.py -nosetests python/tests/test_grant.py -nosetests python/tests/test_history.py - -if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then - python python-twisted/tests/test_publish_async.py - python python-twisted/tests/test_grant_async.py - python python-tornado/tests/test_grant_async.py - flake8 --ignore=E501,E265,E266,E712 python-twisted/ -fi - -flake8 --ignore=E501,E265,E266,E712 python/ python-tornado/ pubnub.py diff --git a/setup.py b/setup.py deleted file mode 100755 index 295969e5..00000000 --- a/setup.py +++ /dev/null @@ -1,26 +0,0 @@ -from setuptools import setup, find_packages - -setup( - name='pubnub', - version='3.7.7', - description='PubNub Real-time push service in the cloud', - author='PubNub', - author_email='support@pubnub.com', - url='http://pubnub.com', - py_modules=['pubnub'], - license='MIT', - classifiers=( - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: Developers', - 'Programming Language :: Python', - 'License :: OSI Approved :: MIT License', - 'Operating System :: OS Independent', - 'Topic :: Internet :: WWW/HTTP', - 'Topic :: Software Development :: Libraries :: Python Modules', - ), - install_requires=[ - 'pycrypto>=2.6.1', - 'requests>=2.4.0' - ], - zip_safe=False, -) From 4f7129f31fc3b3839cbbd425b200f218dd87ce5f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 08:39:23 -0700 Subject: [PATCH 002/468] Add mockup of V4 HereNow --- examples/__init__.py | 0 examples/here_now.py | 16 ++++++ pubnub/__init__.py | 6 ++ pubnub/endpoints/__init__.py | 0 pubnub/endpoints/endpoint.py | 52 ++++++++++++++++++ pubnub/endpoints/presence/__init__.py | 0 pubnub/endpoints/presence/herenow.py | 79 +++++++++++++++++++++++++++ pubnub/errors.py | 11 ++++ pubnub/exceptions.py | 13 +++++ pubnub/models/__init__.py | 0 pubnub/models/consumer/__init__.py | 0 pubnub/models/consumer/presence.py | 18 ++++++ pubnub/pnconfiguration.py | 25 +++++++++ pubnub/pubnub.py | 66 ++++++++++++++++++++++ pubnub/pubnub_core.py | 27 +++++++++ runt-tests.sh | 22 ++++++++ tests/__init__.py | 0 tests/integrational/__init__.py | 0 tests/integrational/test_here_now.py | 19 +++++++ 19 files changed, 354 insertions(+) create mode 100755 examples/__init__.py create mode 100755 examples/here_now.py create mode 100755 pubnub/__init__.py create mode 100755 pubnub/endpoints/__init__.py create mode 100755 pubnub/endpoints/endpoint.py create mode 100755 pubnub/endpoints/presence/__init__.py create mode 100755 pubnub/endpoints/presence/herenow.py create mode 100755 pubnub/errors.py create mode 100755 pubnub/exceptions.py create mode 100755 pubnub/models/__init__.py create mode 100755 pubnub/models/consumer/__init__.py create mode 100755 pubnub/models/consumer/presence.py create mode 100755 pubnub/pnconfiguration.py create mode 100755 pubnub/pubnub.py create mode 100755 pubnub/pubnub_core.py create mode 100755 runt-tests.sh create mode 100755 tests/__init__.py create mode 100755 tests/integrational/__init__.py create mode 100755 tests/integrational/test_here_now.py diff --git a/examples/__init__.py b/examples/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/examples/here_now.py b/examples/here_now.py new file mode 100755 index 00000000..12325926 --- /dev/null +++ b/examples/here_now.py @@ -0,0 +1,16 @@ +# PubNub HereNow usage example +import sys + +sys.path.append("../") + +from pubnub.pnconfiguration import PNConfiguration + +pnconf = PNConfiguration() +pubnub = PubNub(pnconf) + +res = pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .sync() + +print(res.total_occupancy) diff --git a/pubnub/__init__.py b/pubnub/__init__.py new file mode 100755 index 00000000..280d267b --- /dev/null +++ b/pubnub/__init__.py @@ -0,0 +1,6 @@ +# from pnconfiguration import PNConfiguration +# from pubnub import PubNubCore +# from pubnub import PubNub +import os + +PUBNUB_ROOT = os.path.dirname(os.path.abspath(__file__)) diff --git a/pubnub/endpoints/__init__.py b/pubnub/endpoints/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py new file mode 100755 index 00000000..a5613161 --- /dev/null +++ b/pubnub/endpoints/endpoint.py @@ -0,0 +1,52 @@ +import string +from abc import ABCMeta, abstractmethod + +# from pubnub import pubnub.PubNub +from pip._vendor import requests + + +class Endpoint: + __metaclass__ = ABCMeta + + def __init__(self, pubnub): + # assert isinstance(pubnub, pubnub.PubNub) + self.pubnub = pubnub + + @abstractmethod + def do_work(self): + pass + + @abstractmethod + def build_params(self): + pass + + @abstractmethod + def create_response(self, endpoint): + pass + + def sync(self): + server_response = self.do_work() + + # TODO: verify http success + if server_response.status_code != requests.codes.ok: + response_body_text = server_response.text + print(response_body_text) + # TODO: try to get text + + response = self.create_response(server_response) + return response + + def default_params(self): + return { + 'pnsdk': 'Python/' + self.pubnub.version, + 'uuid': self.pubnub.uuid + } + + @classmethod + def join_query(cls, params): + query_list = [] + + for k, v in params.items(): + query_list.append(k + "=" + v) + + return "&".join(query_list) diff --git a/pubnub/endpoints/presence/__init__.py b/pubnub/endpoints/presence/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py new file mode 100755 index 00000000..ef97b43a --- /dev/null +++ b/pubnub/endpoints/presence/herenow.py @@ -0,0 +1,79 @@ +from pubnub.endpoints.endpoint import Endpoint +from pubnub.models.consumer.presence import PNHereNowResult, PNOccupantsData, PNHereNowChannelData + + +class HereNow(Endpoint): + HERE_NOW_PATH = "/v2/presence/sub-key/%s/channel/%s" + HERE_NOW_GLOBAL_PATH = "/v2/presence/sub-key/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = [] + self._channel_groups = [] + self._include_state = False + + def channels(self, channels): + self._channels = channels + return self + + def channel_groups(self, channel_groups): + self._channel_groups = channel_groups + return self + + def include_state(self, should_include_state): + self._include_state = should_include_state + return self + + def do_work(self): + return self.pubnub.request(self.here_now_path(), self.build_params()) + + def build_params(self): + params = self.default_params() + + if len(self._channels) > 0: + params['channels'] = ",".join(self._channels) + + params['state'] = "1" + + return params + + def here_now_path(self): + if len(self._channels) > 0: + channels = ','.join(self._channels) + else: + channels = ',' + + return HereNow.HERE_NOW_PATH % (self.pubnub.config.subscribe_key, channels) + + def create_response(self, envelope): + if len(self._channels) > 1 or len(self._channel_groups) > 0: + return self.parse_multiple_channel_response(envelope) + else: + return self.parse_single_channel_response(envelope) + + def parse_single_channel_response(self, envelope): + return "qwer" + + def parse_multiple_channel_response(self, envelope): + + json_env = envelope.json() + payload = json_env['payload'] + raw_channels = payload['channels'] + channels = [] + + for raw_channel, raw_data in raw_channels.items(): + occupants = [] + for uuid, state in raw_data.items(): + occupants.append(PNOccupantsData(uuid, state)) + + channels.append(PNHereNowChannelData( + channel_name=raw_channel, + occupancy=int(raw_data['occupancy']), + occupants=occupants + )) + + res = PNHereNowResult(int(payload['total_channels']), int(payload['total_channels']), channels) + + return res + +# Endpoint.register(HereNow) \ No newline at end of file diff --git a/pubnub/errors.py b/pubnub/errors.py new file mode 100755 index 00000000..3a78e3d5 --- /dev/null +++ b/pubnub/errors.py @@ -0,0 +1,11 @@ +PNERR_CLIENT_TIMEOUT = "Client Timeout" +PNERR__TIMEOUT = "Timeout Occurred" +# TODO: clarify to not confuse with 4xx and 5xx http erros +PNERR_HTTP_ERROR = "HTTP Error" +PNERR_CONNECTION_ERROR = "Connection Error" +PNERR_TOO_MANY_REDIRECTS_ERROR = "Too many redirects" +# For 5xx server responses +PNERR_SERVER_ERROR = "HTTP Server Error" +# For 4xx server responses +PNERR_CLIENT_ERROR = "HTTP Client Error" +PNERR_UNKNOWN_ERROR = "Unknown Error" diff --git a/pubnub/exceptions.py b/pubnub/exceptions.py new file mode 100755 index 00000000..e514fdf1 --- /dev/null +++ b/pubnub/exceptions.py @@ -0,0 +1,13 @@ +class PubNubException(Exception): + def __init__(self, errormsg="", status_code=0, pn_error=None): + self._errormsg = errormsg + self._status_code = status_code + self._pn_error = pn_error + + if len(str(errormsg)) > 0: + msg = str(pn_error) + ": " + str(errormsg) + else: + msg = str(pn_error) + + super(PubNubException, self).__init__(msg) + diff --git a/pubnub/models/__init__.py b/pubnub/models/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/pubnub/models/consumer/__init__.py b/pubnub/models/consumer/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py new file mode 100755 index 00000000..d93a1376 --- /dev/null +++ b/pubnub/models/consumer/presence.py @@ -0,0 +1,18 @@ +class PNHereNowResult(object): + def __init__(self, total_channels, total_occupancy, channels): + self.total_channels = total_channels + self.total_occupancy = total_occupancy + self.channels = channels + + +class PNHereNowChannelData(object): + def __init__(self, channel_name, occupancy, occupants): + self.channel_name = channel_name + self.occupancy = occupancy + self.occupants = occupants + + +class PNOccupantsData(object): + def __init__(self, uuid, state): + self.uuid = uuid, + self.state = state diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py new file mode 100755 index 00000000..7e85cda6 --- /dev/null +++ b/pubnub/pnconfiguration.py @@ -0,0 +1,25 @@ + +class PNConfiguration(object): + def __init__(self): + self.presence_timeout = 300 + # TODO: generate a random uuid + self.uuid = "" + self.origin = "pubsub.pubnub.com" + self.ssl = False + self.non_subscribe_request_timeout = 10 + self.subscribe_timeout = 310 + self.connect_timeout = 5 + self.subscribe_key = "demo" + self.publish_key = "demo" + + def scheme(self): + if self.ssl: + return "https://" + else: + return "http://" + + def scheme_and_host(self): + return self.scheme() + self.origin + + # TODO: set log level + # TODO: set log level diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py new file mode 100755 index 00000000..4ad59570 --- /dev/null +++ b/pubnub/pubnub.py @@ -0,0 +1,66 @@ +from pip._vendor import requests +from pip._vendor.requests import ConnectionError +from pip._vendor.requests.packages.urllib3.exceptions import HTTPError + +from .exceptions import PubNubException +from .errors import PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, \ + PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR +from .pubnub_core import PubNubCore + + +class PubNub(PubNubCore): + """PubNub Python API""" + + def __init__(self, config): + PubNubCore.__init__(self, config) + self.session = requests.Session() + + def request(self, path, query): + url = self.config.scheme_and_host() + path + print(url) + + # connection error + try: + res = self.session.get(url, params=query) + except ConnectionError as e: + raise PubNubException( + pn_error=PNERR_CONNECTION_ERROR, + errormsg=str(e) + ) + except HTTPError as e: + raise PubNubException( + pn_error=PNERR_HTTP_ERROR, + errormsg=str(e) + ) + except requests.exceptions.Timeout as e: + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + except requests.exceptions.TooManyRedirects as e: + raise PubNubException( + pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, + errormsg=str(e) + ) + except: + raise PubNubException(pn_error=PNERR_UNKNOWN_ERROR) + + # server error + if res.status_code != requests.codes.ok: + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + raise PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ) + + return res diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py new file mode 100755 index 00000000..ecd231bf --- /dev/null +++ b/pubnub/pubnub_core.py @@ -0,0 +1,27 @@ +from abc import ABCMeta, abstractmethod + +from .endpoints.presence.herenow import HereNow + + +class PubNubCore: + """PubNub Python API""" + + __metaclass__ = ABCMeta + + def __init__(self, config): + self.config = config + + @abstractmethod + def request(self, path, query): + pass + + def here_now(self): + return HereNow(self) + + @property + def version(self): + return "4.0.0" + + @property + def uuid(self): + return self.config.uuid diff --git a/runt-tests.sh b/runt-tests.sh new file mode 100755 index 00000000..c1d4e34b --- /dev/null +++ b/runt-tests.sh @@ -0,0 +1,22 @@ +#!/usr/bin/env python +# Don't run tests from the root repo dir. +# We want to ensure we're importing from the installed +# binary package not from the CWD. + +import os +from subprocess import check_call + +_dname = os.path.dirname + +#REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__)))) +REPO_ROOT = _dname(os.path.abspath(__file__)) +os.chdir(os.path.join(REPO_ROOT, 'tests')) + + +def run(command): + return check_call(command, shell=True) + + +run('nose2') +#run('nosetests --with-coverage --cover-erase --cover-package botocore ' +# '--with-xunit --cover-xml -v unit/ functional/') \ No newline at end of file diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/tests/integrational/__init__.py b/tests/integrational/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/tests/integrational/test_here_now.py b/tests/integrational/test_here_now.py new file mode 100755 index 00000000..b6cd9f8f --- /dev/null +++ b/tests/integrational/test_here_now.py @@ -0,0 +1,19 @@ +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub + +import unittest + + +class TestHereNowSuccess(unittest.TestCase): + def test_blah(self): + + + pnconf = PNConfiguration() + pubnub = PubNub(pnconf) + + res = pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .sync() + + print(res.total_occupancy) From b59447a0c0ff343868f0e9533341f500b60ef992 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 08:49:12 -0700 Subject: [PATCH 003/468] Add travis config --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100755 index 00000000..20be6917 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,9 @@ +language: python +python: + - "2.6" + - "2.7" + - "3.3" + - "3.4" + - "3.5" +sudo: false +script: bash runt-tests.sh \ No newline at end of file From 358283a63675f3253bca772d871143128f4ced14 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 08:52:14 -0700 Subject: [PATCH 004/468] Rename test runner --- runt-tests.sh => run-tests | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename runt-tests.sh => run-tests (100%) diff --git a/runt-tests.sh b/run-tests similarity index 100% rename from runt-tests.sh rename to run-tests From d8c99272ecfae0274ca742a80fd49edee63f2ea7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 08:52:38 -0700 Subject: [PATCH 005/468] Fix travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 20be6917..d4002933 100755 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ python: - "3.4" - "3.5" sudo: false -script: bash runt-tests.sh \ No newline at end of file +script: python runt-tests.sh From b9cd6ec72e6527914c8341b8dbe1dd5d07f5780d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 08:53:52 -0700 Subject: [PATCH 006/468] Fix travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d4002933..3c9fc62d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,4 @@ python: - "3.4" - "3.5" sudo: false -script: python runt-tests.sh +script: python run-tests From c4705c5abe71ab71d13abcab1c911158ce4c98e7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 09:12:44 -0700 Subject: [PATCH 007/468] Add scripts folder; Add install script --- .travis.yml | 3 ++- requirements.txt | 1 + scripts/install.sh | 3 +++ run-tests => scripts/run-tests | 0 4 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 requirements.txt create mode 100755 scripts/install.sh rename run-tests => scripts/run-tests (100%) diff --git a/.travis.yml b/.travis.yml index 3c9fc62d..3a5598ba 100755 --- a/.travis.yml +++ b/.travis.yml @@ -6,4 +6,5 @@ python: - "3.4" - "3.5" sudo: false -script: python run-tests +install: bash scripts/install +script: python scripts/run-tests diff --git a/requirements.txt b/requirements.txt new file mode 100755 index 00000000..794f0b38 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +nose2==0.6.4 \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh new file mode 100755 index 00000000..1d63ee1d --- /dev/null +++ b/scripts/install.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +pip install -r requirements.txt \ No newline at end of file diff --git a/run-tests b/scripts/run-tests similarity index 100% rename from run-tests rename to scripts/run-tests From a0e4ab0998a158c4fe27ae50222b16625893bf5c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 09:15:00 -0700 Subject: [PATCH 008/468] Fix travis config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a5598ba..2a196b09 100755 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,5 @@ python: - "3.4" - "3.5" sudo: false -install: bash scripts/install +install: bash scripts/install.sh script: python scripts/run-tests From 5c375b7d2c1781ca0b86b2f860c04f3d5177e4a7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 09:15:43 -0700 Subject: [PATCH 009/468] Remove python 2.6 from travis builds --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2a196b09..8fc6532f 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: python python: - - "2.6" - "2.7" - "3.3" - "3.4" From e62c4e242d33ac57eb8681dfa963d84049258fcc Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 5 May 2016 09:19:38 -0700 Subject: [PATCH 010/468] Fix tests runner --- scripts/run-tests | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/run-tests b/scripts/run-tests index c1d4e34b..0a0f67de 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -8,8 +8,7 @@ from subprocess import check_call _dname = os.path.dirname -#REPO_ROOT = _dname(_dname(_dname(os.path.abspath(__file__)))) -REPO_ROOT = _dname(os.path.abspath(__file__)) +REPO_ROOT = _dname(_dname(os.path.abspath(__file__))) os.chdir(os.path.join(REPO_ROOT, 'tests')) @@ -17,6 +16,4 @@ def run(command): return check_call(command, shell=True) -run('nose2') -#run('nosetests --with-coverage --cover-erase --cover-package botocore ' -# '--with-xunit --cover-xml -v unit/ functional/') \ No newline at end of file +run('nose2') \ No newline at end of file From a4190d949aca0ed44069e2365d5089236fe09616 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 6 May 2016 06:58:16 -0700 Subject: [PATCH 011/468] Add basic PubNub/async request handling --- pubnub/endpoints/endpoint.py | 20 +++++- pubnub/endpoints/presence/herenow.py | 6 +- pubnub/pubnub.py | 102 +++++++++++++-------------- pubnub/pubnub_async.py | 27 +++++++ pubnub/pubnub_core.py | 62 +++++++++++++++- pubnub/pubnub_twisted.py | 6 ++ tests/integrational/test_here_now.py | 30 ++++++-- 7 files changed, 186 insertions(+), 67 deletions(-) create mode 100755 pubnub/pubnub_async.py create mode 100755 pubnub/pubnub_twisted.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index a5613161..deb9ea00 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,9 +1,10 @@ -import string from abc import ABCMeta, abstractmethod # from pubnub import pubnub.PubNub from pip._vendor import requests +from pubnub.exceptions import PubNubException + class Endpoint: __metaclass__ = ABCMeta @@ -13,7 +14,7 @@ def __init__(self, pubnub): self.pubnub = pubnub @abstractmethod - def do_work(self): + def build_path(self): pass @abstractmethod @@ -25,7 +26,8 @@ def create_response(self, endpoint): pass def sync(self): - server_response = self.do_work() + # TODO: validate_params() + server_response = self.pubnub.request_sync(self.build_path(), self.build_params()) # TODO: verify http success if server_response.status_code != requests.codes.ok: @@ -36,6 +38,18 @@ def sync(self): response = self.create_response(server_response) return response + def async(self, success, error): + def success_wrapper(server_response): + print("success") + success(self.create_response(server_response)) + + def error_wrapper(msg): + error(PubNubException( + pn_error=msg + )) + + return self.pubnub.request_async(self.build_path(), self.build_params(), success_wrapper, error_wrapper) + def default_params(self): return { 'pnsdk': 'Python/' + self.pubnub.version, diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index ef97b43a..8834dfc8 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -24,9 +24,6 @@ def include_state(self, should_include_state): self._include_state = should_include_state return self - def do_work(self): - return self.pubnub.request(self.here_now_path(), self.build_params()) - def build_params(self): params = self.default_params() @@ -37,7 +34,7 @@ def build_params(self): return params - def here_now_path(self): + def build_path(self): if len(self._channels) > 0: channels = ','.join(self._channels) else: @@ -55,6 +52,7 @@ def parse_single_channel_response(self, envelope): return "qwer" def parse_multiple_channel_response(self, envelope): + print(envelope) json_env = envelope.json() payload = json_env['payload'] diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 4ad59570..cdcd2ae4 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,10 +1,8 @@ -from pip._vendor import requests -from pip._vendor.requests import ConnectionError -from pip._vendor.requests.packages.urllib3.exceptions import HTTPError +import json +import threading from .exceptions import PubNubException -from .errors import PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, \ - PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR + from .pubnub_core import PubNubCore @@ -13,54 +11,50 @@ class PubNub(PubNubCore): def __init__(self, config): PubNubCore.__init__(self, config) - self.session = requests.Session() - def request(self, path, query): + def request_async(self, path, query, success, error): url = self.config.scheme_and_host() + path - print(url) - - # connection error - try: - res = self.session.get(url, params=query) - except ConnectionError as e: - raise PubNubException( - pn_error=PNERR_CONNECTION_ERROR, - errormsg=str(e) - ) - except HTTPError as e: - raise PubNubException( - pn_error=PNERR_HTTP_ERROR, - errormsg=str(e) - ) - except requests.exceptions.Timeout as e: - raise PubNubException( - pn_error=PNERR_CLIENT_TIMEOUT, - errormsg=str(e) - ) - except requests.exceptions.TooManyRedirects as e: - raise PubNubException( - pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, - errormsg=str(e) - ) - except: - raise PubNubException(pn_error=PNERR_UNKNOWN_ERROR) - - # server error - if res.status_code != requests.codes.ok: - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - - raise PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - ) - - return res + + client = AsyncHTTPClient(self, url=url,callback=success, error=error) + + thread = threading.Thread(target=client.run) + thread.start() + + return thread + + +class AsyncHTTPClient: + """A wrapper for threaded calls""" + + def __init__(self, pubnub, url,callback=None, error=None, id=None): + # TODO: introduce timeouts + self.url = url + self.id = id + self.success = callback + self.error = error + self.pubnub = pubnub + + def cancel(self): + self.success = None + self.error = None + + def run(self): + def _invoke(func, data): + if func is not None: + func(get_data_for_user(data)) + + resp = self.pubnub.session.get(self.url) + if resp.status_code == 200: + _invoke(self.success, resp) + else: + _invoke(self.error, resp) + + +def get_data_for_user(data): + try: + if 'message' in data and 'payload' in data: + return {'message': data['message'], 'payload': data['payload']} + else: + return data + except TypeError: + return data diff --git a/pubnub/pubnub_async.py b/pubnub/pubnub_async.py new file mode 100755 index 00000000..8e9162c9 --- /dev/null +++ b/pubnub/pubnub_async.py @@ -0,0 +1,27 @@ +from abc import ABCMeta, abstractmethod + +from .endpoints.presence.herenow import HereNow + + +class PubNubAsync: + """PubNub Python API for Python >= 3.5 with async/await syntax for asynchronous calls""" + + __metaclass__ = ABCMeta + + def __init__(self, config): + self.config = config + + @abstractmethod + def request_async(self, path, query): + pass + + def here_now(self): + return HereNow(self) + + @property + def version(self): + return "4.0.0" + + @property + def uuid(self): + return self.config.uuid diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index ecd231bf..535c3726 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,18 +1,76 @@ from abc import ABCMeta, abstractmethod +from pip._vendor import requests +from pip._vendor.requests import ConnectionError +from pip._vendor.requests.packages.urllib3.exceptions import HTTPError + from .endpoints.presence.herenow import HereNow +from .exceptions import PubNubException +from .errors import PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, \ + PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR class PubNubCore: - """PubNub Python API""" + """A base class for PubNub Python API implementations""" __metaclass__ = ABCMeta def __init__(self, config): self.config = config + self.session = requests.Session() + + def request_sync(self, path, query): + url = self.config.scheme_and_host() + path + print(url) + + # connection error + try: + res = self.session.get(url, params=query) + except ConnectionError as e: + raise PubNubException( + pn_error=PNERR_CONNECTION_ERROR, + errormsg=str(e) + ) + except HTTPError as e: + raise PubNubException( + pn_error=PNERR_HTTP_ERROR, + errormsg=str(e) + ) + except requests.exceptions.Timeout as e: + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + except requests.exceptions.TooManyRedirects as e: + raise PubNubException( + pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, + errormsg=str(e) + ) + except: + raise PubNubException(pn_error=PNERR_UNKNOWN_ERROR) + + # server error + if res.status_code != requests.codes.ok: + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + raise PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ) + + return res @abstractmethod - def request(self, path, query): + def request_async(self, path, query, success, error): pass def here_now(self): diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py new file mode 100755 index 00000000..de5cfdc6 --- /dev/null +++ b/pubnub/pubnub_twisted.py @@ -0,0 +1,6 @@ +from .pubnub_core import PubNubCore + + +class PubNubTwisted(PubNubCore): + """PubNub Python API for Twisted framework""" + pass \ No newline at end of file diff --git a/tests/integrational/test_here_now.py b/tests/integrational/test_here_now.py index b6cd9f8f..825ba439 100755 --- a/tests/integrational/test_here_now.py +++ b/tests/integrational/test_here_now.py @@ -4,10 +4,8 @@ import unittest -class TestHereNowSuccess(unittest.TestCase): - def test_blah(self): - - +class TestPubNubSyncHereNow(unittest.TestCase): + def test_success(self): pnconf = PNConfiguration() pubnub = PubNub(pnconf) @@ -17,3 +15,27 @@ def test_blah(self): .sync() print(res.total_occupancy) + + +class TestPubNubAsyncHereNow(unittest.TestCase): + def test_success(self): + pnconf = PNConfiguration() + pubnub = PubNub(pnconf) + + def success(res): + print("success") + print(res.total_occupancy) + + def error(err): + print("error") + print(err) + + thread = pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .async(success, error) + + print("awaiting") + thread.join() + print("finished") + From 857f47e6de2f3ed755a38a50f6f1bda7a95ec01d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 7 May 2016 00:46:22 -0700 Subject: [PATCH 012/468] Add basic Tornado implementation --- pubnub/endpoints/endpoint.py | 9 +- pubnub/endpoints/presence/herenow.py | 8 +- pubnub/pubnub.py | 14 +-- pubnub/pubnub_async.py | 27 ----- pubnub/pubnub_core.py | 2 +- pubnub/pubnub_tornado.py | 120 +++++++++++++++++++ pubnub/utils.py | 9 ++ tests/integrational/test_here_now.py | 1 - tests/integrational/tornado/__init__.py | 0 tests/integrational/tornado/test_here_now.py | 31 +++++ 10 files changed, 171 insertions(+), 50 deletions(-) delete mode 100755 pubnub/pubnub_async.py create mode 100755 pubnub/pubnub_tornado.py create mode 100755 pubnub/utils.py create mode 100755 tests/integrational/tornado/__init__.py create mode 100755 tests/integrational/tornado/test_here_now.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index deb9ea00..2aaad9f0 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,8 +1,5 @@ from abc import ABCMeta, abstractmethod -# from pubnub import pubnub.PubNub -from pip._vendor import requests - from pubnub.exceptions import PubNubException @@ -30,9 +27,9 @@ def sync(self): server_response = self.pubnub.request_sync(self.build_path(), self.build_params()) # TODO: verify http success - if server_response.status_code != requests.codes.ok: - response_body_text = server_response.text - print(response_body_text) + # if server_response.status_code != requests.codes.ok: + # response_body_text = server_response.text + # print(response_body_text) # TODO: try to get text response = self.create_response(server_response) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 8834dfc8..755ec945 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -52,10 +52,12 @@ def parse_single_channel_response(self, envelope): return "qwer" def parse_multiple_channel_response(self, envelope): - print(envelope) + """ + :param envelope: an already serialized json response + :return: + """ - json_env = envelope.json() - payload = json_env['payload'] + payload = envelope['payload'] raw_channels = payload['channels'] channels = [] diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index cdcd2ae4..2e9bcb27 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,7 +1,6 @@ -import json import threading -from .exceptions import PubNubException +from pubnub.utils import get_data_for_user from .pubnub_core import PubNubCore @@ -45,16 +44,7 @@ def _invoke(func, data): resp = self.pubnub.session.get(self.url) if resp.status_code == 200: - _invoke(self.success, resp) + _invoke(self.success, resp.json()) else: _invoke(self.error, resp) - -def get_data_for_user(data): - try: - if 'message' in data and 'payload' in data: - return {'message': data['message'], 'payload': data['payload']} - else: - return data - except TypeError: - return data diff --git a/pubnub/pubnub_async.py b/pubnub/pubnub_async.py deleted file mode 100755 index 8e9162c9..00000000 --- a/pubnub/pubnub_async.py +++ /dev/null @@ -1,27 +0,0 @@ -from abc import ABCMeta, abstractmethod - -from .endpoints.presence.herenow import HereNow - - -class PubNubAsync: - """PubNub Python API for Python >= 3.5 with async/await syntax for asynchronous calls""" - - __metaclass__ = ABCMeta - - def __init__(self, config): - self.config = config - - @abstractmethod - def request_async(self, path, query): - pass - - def here_now(self): - return HereNow(self) - - @property - def version(self): - return "4.0.0" - - @property - def uuid(self): - return self.config.uuid diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 535c3726..a6c960b4 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -67,7 +67,7 @@ def request_sync(self, path, query): status_code=res.status_code ) - return res + return res.json() @abstractmethod def request_async(self, path, query, success, error): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py new file mode 100755 index 00000000..43c82b87 --- /dev/null +++ b/pubnub/pubnub_tornado.py @@ -0,0 +1,120 @@ +import json +import time + +from pubnub.utils import get_data_for_user +from .pubnub_core import PubNubCore + +import tornado.httpclient +import tornado.ioloop +from tornado.stack_context import ExceptionStackContext + +default_ioloop = tornado.ioloop.IOLoop.instance() + + +class PubNubTornado(PubNubCore): + def stop(self): + self._ioloop.stop() + + def start(self): + self._ioloop.start() + + def timeout(self, delay, callback, *args): + handle = None + + def cancel(): + self._ioloop.remove_timeout(handle) + + def cb(): + if callback is not None: + callback(*args) + + handle = self._ioloop.add_timeout(time.time() + float(delay), cb) + + return cancel + + def set_ioloop(self, ioloop): + self._ioloop = ioloop + + def __init__(self, config): + super(PubNubTornado, self).__init__(config) + self._ioloop = default_ioloop + + # self.headers = {'User-Agent': 'Python-Tornado', 'Accept-Encoding': self.accept_encoding, 'V': self.version} + # TODO: add accept encoding + self.headers = {'User-Agent': 'Python-Tornado', 'V': self.version} + self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) + self.id = None + self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.version + + def request_async(self, path, query, success, error): + print("async req") + url = self.config.scheme_and_host() + path + self._request( + url=url, + callback=success, + error=error, + # TODO: set correct timeout + timeout=15, + connect_timeout=5, + ) + + def _request(self, url, callback=None, error=None, + single=False, timeout=15, connect_timeout=5, encoder_map=None): + + def _invoke(func, data): + if func is not None: + func(get_data_for_user(data)) + + # TODO: encode url + # url = self.getUrl(url, encoder_map) + + request = tornado.httpclient.HTTPRequest( + url, 'GET', + self.headers, + connect_timeout=connect_timeout, + request_timeout=timeout) + + if single is True: + id = time.time() + self.id = id + + def responseCallback(response): + if single is True: + if not id == self.id: + return None + + body = response._get_body() + + if body is None: + # TODO: handle exception + return + + def handle_exc(*args): + return True + + if response.error is not None: + with ExceptionStackContext(handle_exc): + if response.code in [403, 401]: + response.rethrow() + else: + _invoke(error, response.reason) + return + + try: + data = json.loads(body) + except TypeError: + try: + data = json.loads(body.decode("utf-8")) + except ValueError: + _invoke(error, 'json decode error') + return + + if 'error' in data and 'status' in data and 'status' != 200: + _invoke(error, data) + else: + _invoke(callback, data) + + self.http.fetch( + request=request, + callback=responseCallback + ) diff --git a/pubnub/utils.py b/pubnub/utils.py new file mode 100755 index 00000000..c38b935c --- /dev/null +++ b/pubnub/utils.py @@ -0,0 +1,9 @@ + +def get_data_for_user(data): + try: + if 'message' in data and 'payload' in data: + return {'message': data['message'], 'payload': data['payload']} + else: + return data + except TypeError: + return data diff --git a/tests/integrational/test_here_now.py b/tests/integrational/test_here_now.py index 825ba439..e6f7c3d3 100755 --- a/tests/integrational/test_here_now.py +++ b/tests/integrational/test_here_now.py @@ -38,4 +38,3 @@ def error(err): print("awaiting") thread.join() print("finished") - diff --git a/tests/integrational/tornado/__init__.py b/tests/integrational/tornado/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py new file mode 100755 index 00000000..abd09a25 --- /dev/null +++ b/tests/integrational/tornado/test_here_now.py @@ -0,0 +1,31 @@ +from tornado.testing import AsyncHTTPTestCase, AsyncTestCase + +from pubnub.pnconfiguration import PNConfiguration + +from pubnub.pubnub_tornado import PubNubTornado + + +class TestPubNubAsyncAsyncHereNow(AsyncTestCase): + + def test_success(self): + pnconf = PNConfiguration() + pubnub = PubNubTornado(pnconf) + pubnub.set_ioloop(self.io_loop) + + def success(res): + print(res.total_occupancy) + pubnub.stop() + self.stop() + + def error(err): + print(err) + pubnub.stop() + self.stop() + + pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .async(success, error) + + pubnub.start() + self.wait() From d95156abe5e0ebbd0a8356d31b7f3be6f64914ae Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 7 May 2016 00:50:32 -0700 Subject: [PATCH 013/468] Fix module imports --- pubnub/pubnub.py | 2 +- pubnub/pubnub_tornado.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 2e9bcb27..2a62b65a 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,6 +1,6 @@ import threading -from pubnub.utils import get_data_for_user +from .utils import get_data_for_user from .pubnub_core import PubNubCore diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 43c82b87..b6b38312 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,7 +1,7 @@ import json import time -from pubnub.utils import get_data_for_user +from .utils import get_data_for_user from .pubnub_core import PubNubCore import tornado.httpclient From 5009b2caf836c3b4790f06c43d3d6639add10422 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 7 May 2016 00:51:32 -0700 Subject: [PATCH 014/468] Add 2.6, 3.0, 3.1, 3.2, pypy versions to travis --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8fc6532f..a5ff8889 100755 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,14 @@ language: python python: + - "2.6" - "2.7" + - "3.0" + - "3.1" + - "3.2" - "3.3" - "3.4" - "3.5" + - "pypy" sudo: false install: bash scripts/install.sh script: python scripts/run-tests From fea11564b6ca674ff0cd7e157c83365a84b73c0f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 7 May 2016 00:53:34 -0700 Subject: [PATCH 015/468] Add tornado to requirements --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 794f0b38..4d101264 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1,2 @@ -nose2==0.6.4 \ No newline at end of file +nose2==0.6.4 +tornado From 76410fe629ef09bbfb385a4b2c3c7e6464d103ab Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 7 May 2016 00:55:47 -0700 Subject: [PATCH 016/468] Remove 3.0 and 3.1 from travis builds --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a5ff8889..cedf0f2e 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,6 @@ language: python python: - "2.6" - "2.7" - - "3.0" - - "3.1" - "3.2" - "3.3" - "3.4" From ba24384072e77b6c2c257097998643e8bb63df82 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 04:55:39 -0700 Subject: [PATCH 017/468] Add basic Twisted implementation --- examples/twisted/__init__.py | 0 examples/twisted/here_now.py | 30 ++++ pubnub/endpoints/endpoint.py | 15 +- pubnub/endpoints/presence/herenow.py | 6 +- pubnub/pnconfiguration.py | 9 +- pubnub/pubnub_core.py | 11 +- pubnub/pubnub_tornado.py | 2 +- pubnub/pubnub_twisted.py | 157 ++++++++++++++++++- tests/integrational/twisted/__init__.py | 0 tests/integrational/twisted/test_here_now.py | 70 +++++++++ 10 files changed, 276 insertions(+), 24 deletions(-) create mode 100644 examples/twisted/__init__.py create mode 100644 examples/twisted/here_now.py create mode 100755 tests/integrational/twisted/__init__.py create mode 100755 tests/integrational/twisted/test_here_now.py diff --git a/examples/twisted/__init__.py b/examples/twisted/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/twisted/here_now.py b/examples/twisted/here_now.py new file mode 100644 index 00000000..c2230e19 --- /dev/null +++ b/examples/twisted/here_now.py @@ -0,0 +1,30 @@ +# PubNub HereNow usage example +import sys + +sys.path.append("../../") + +from pubnub.pubnub_twisted import PubNubTwisted +from pubnub.pnconfiguration import PNConfiguration + +pnconf = PNConfiguration() +pubnub = PubNubTwisted(pnconf) + + +def success(res): + print("success") + print(res.total_occupancy) + pubnub.stop() + + +def error(err): + print("error") + print(err) + pubnub.stop() + + +pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .async(success, error) + +pubnub.start() diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 2aaad9f0..c22b100d 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -7,7 +7,6 @@ class Endpoint: __metaclass__ = ABCMeta def __init__(self, pubnub): - # assert isinstance(pubnub, pubnub.PubNub) self.pubnub = pubnub @abstractmethod @@ -26,18 +25,11 @@ def sync(self): # TODO: validate_params() server_response = self.pubnub.request_sync(self.build_path(), self.build_params()) - # TODO: verify http success - # if server_response.status_code != requests.codes.ok: - # response_body_text = server_response.text - # print(response_body_text) - # TODO: try to get text - response = self.create_response(server_response) return response def async(self, success, error): def success_wrapper(server_response): - print("success") success(self.create_response(server_response)) def error_wrapper(msg): @@ -45,7 +37,12 @@ def error_wrapper(msg): pn_error=msg )) - return self.pubnub.request_async(self.build_path(), self.build_params(), success_wrapper, error_wrapper) + return self.pubnub.request_async(self.build_path(), self.build_params(), + success_wrapper, error_wrapper) + + def deferred(self): + return self.pubnub.request_deferred(self.build_path(), self.build_params())\ + .addCallback(self.create_response) def default_params(self): return { diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 755ec945..d995d991 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -27,8 +27,8 @@ def include_state(self, should_include_state): def build_params(self): params = self.default_params() - if len(self._channels) > 0: - params['channels'] = ",".join(self._channels) + if len(self._channel_groups) > 0: + params['channel-groups'] = ",".join(self._channels) params['state'] = "1" @@ -75,5 +75,3 @@ def parse_multiple_channel_response(self, envelope): res = PNHereNowResult(int(payload['total_channels']), int(payload['total_channels']), channels) return res - -# Endpoint.register(HereNow) \ No newline at end of file diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 7e85cda6..36a4ef03 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -14,12 +14,15 @@ def __init__(self): def scheme(self): if self.ssl: - return "https://" + return "https" else: - return "http://" + return "http" + + def scheme_extended(self): + return self.scheme() + "://" def scheme_and_host(self): - return self.scheme() + self.origin + return self.scheme_extended() + self.origin # TODO: set log level # TODO: set log level diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index a6c960b4..5172ecc0 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -46,8 +46,11 @@ def request_sync(self, path, query): pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, errormsg=str(e) ) - except: - raise PubNubException(pn_error=PNERR_UNKNOWN_ERROR) + except Exception as e: + raise PubNubException ( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg=str(e) + ) # server error if res.status_code != requests.codes.ok: @@ -69,10 +72,6 @@ def request_sync(self, path, query): return res.json() - @abstractmethod - def request_async(self, path, query, success, error): - pass - def here_now(self): return HereNow(self) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index b6b38312..a9892520 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -47,7 +47,7 @@ def __init__(self, config): self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.version def request_async(self, path, query, success, error): - print("async req") + # TODO: query param is not used url = self.config.scheme_and_host() + path self._request( url=url, diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index de5cfdc6..44878d06 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -1,6 +1,161 @@ +import json +import urllib +import urlparse + +from twisted.internet import reactor as _reactor +from twisted.internet.defer import Deferred +from twisted.internet.protocol import Protocol +from twisted.web.client import Agent, ContentDecoderAgent +from twisted.web.client import RedirectAgent, GzipDecoder +from twisted.web.client import HTTPConnectionPool +from twisted.web.http_headers import Headers +from twisted.internet.ssl import ClientContextFactory + +from .utils import get_data_for_user from .pubnub_core import PubNubCore +class WebClientContextFactory(ClientContextFactory): + def getContext(self, hostname, port): + return ClientContextFactory.getContext(self) + + +class PubNubResponse(Protocol): + def __init__(self, finished): + self.finished = finished + + def dataReceived(self, bytes): + self.finished.callback(bytes) + + class PubNubTwisted(PubNubCore): """PubNub Python API for Twisted framework""" - pass \ No newline at end of file + + def __init__(self, config, pool=None, reactor=None): + super(PubNubTwisted, self).__init__(config) + + if reactor is None: + self.reactor = _reactor + else: + self.reactor = reactor + + if pool is None: + self.pnconn_pool = HTTPConnectionPool(self.reactor, persistent=True) + self.pnconn_pool.maxPersistentPerHost = 100000 + self.pnconn_pool.cachedConnectionTimeout = 15 + self.pnconn_pool.retryAutomatically = True + else: + self.pnconn_pool = pool + + self.headers = {'User-Agent': ['Python-Twisted'], 'V': [self.version]} + self.pnsdk = 'PubNub-Python-' + 'Twisted' + '/' + self.version + + def start(self): + self.reactor.run() + + def stop(self): + self.reactor.stop() + + def timeout(self, delay, callback, *args): + def cb(): + if callback is not None: + callback(*args) + + timeout = self.reactor.callLater(delay, cb) + + def cancel(): + if timeout.active(): + timeout.cancel() + + return cancel + + def request_async(self, path, query, success, error): + """ + Request in non-common for Twisted way - using callbacks + WARNING: currently is buggy + + :param error: + :param success: + :param path: + :param query: + :return: async handler + """ + def handler(): + def _invoke(func, data): + if func is not None: + func(get_data_for_user(data)) + + def s(data): + _invoke(success, data) + + def e(err): + _invoke(error, err) + + self.request_deferred(path, query).addCallbacks(s, e) + + return handler() + + def request_deferred(self, path, query): + # TODO: handle timeout and encoder_map + # TODO: unify error objects + rc = self.reactor + pnconn_pool = self.pnconn_pool + headers = self.headers + + url = urlparse.urlunsplit((self.config.scheme(), self.config.origin, + path, urllib.urlencode(query), '')) + + print(url) + + def handler(): + # url = self.getUrl(request, encoder_map) + + agent = ContentDecoderAgent(RedirectAgent(Agent( + rc, + contextFactory=WebClientContextFactory(), + pool=pnconn_pool + )), [('gzip', GzipDecoder)]) + + try: + request = agent.request( + 'GET', url, Headers(headers), None) + except TypeError: + request = agent.request( + 'GET', url.encode(), Headers(headers), None) + + def received(response): + finished = Deferred() + response.deliverBody(PubNubResponse(finished)) + return finished + + def complete(data): + d = Deferred() + + try: + data = json.loads(data) + except ValueError: + try: + data = json.loads(data.decode("utf-8")) + except ValueError: + d.errback('json decode error') + return + + if 'error' in data and 'status' in data and 'status' != 200: + d.errback(data) + else: + d.callback(data) + + return d + + def errback(msg): + print("TODO: handle errback") + # TODO: handle this case + d = Deferred() + d.errback(msg) + return d + + request.addCallbacks(received, errback) + request.addCallbacks(complete, errback) + return request + + return handler() diff --git a/tests/integrational/twisted/__init__.py b/tests/integrational/twisted/__init__.py new file mode 100755 index 00000000..e69de29b diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py new file mode 100755 index 00000000..8425d450 --- /dev/null +++ b/tests/integrational/twisted/test_here_now.py @@ -0,0 +1,70 @@ +from twisted.internet import defer +from twisted.internet.task import deferLater +from twisted.internet.tcp import Client +from twisted.internet import reactor +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_twisted import PubNubTwisted + + +class TestPubNubAsyncAsyncHereNow(unittest.TestCase): + def setUp(self): + self.pool = HTTPConnectionPool(reactor, False) + + def tearDown(self): + def _check_fds(_): + fds = set(reactor.getReaders() + reactor.getReaders()) + if not [fd for fd in fds if isinstance(fd, Client)]: + return + return deferLater(reactor, 0, _check_fds, None) + + return self.pool.closeCachedConnections().addBoth(_check_fds) + + def success(self, res): + self.assertEqual(res.total_occupancy, 11) + + def error(self, error): + return defer.fail(Exception("Error callback should not be invoked", error)) + + def test_success_deferred(self): + d = defer.Deferred() + + pnconf = PNConfiguration() + pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .deferred() \ + .addCallback(self.success) \ + .addCallbacks(d.callback, d.errback) + + return d + + def xtest_success_async(self): + d = defer.Deferred() + + pnconf = PNConfiguration() + pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + success = self.success + error = self.error + + def success_wrapper(res): + success(res) + # REVIEW: Hanging on assertion + d.callback(None) + + def error_wrapper(err): + error(err) + d.errback(None) + + pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .async(success_wrapper, error_wrapper) + + return d + From 9f0183f56e9295340d2fd641eaffeccafffe0aef Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 04:56:31 -0700 Subject: [PATCH 018/468] Add _trial_temp to .gitignore --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cdc797df..e84d398a 100644 --- a/.gitignore +++ b/.gitignore @@ -65,4 +65,7 @@ target/ # pyenv .python-version -.idea \ No newline at end of file +.idea + +# Twisted +_trial_temp From 5b85f6d4f497e5c83cc21c705483893a343a6ab0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 07:13:16 -0700 Subject: [PATCH 019/468] Fix twisted here_now test --- tests/integrational/twisted/test_here_now.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py index 8425d450..e3244c93 100755 --- a/tests/integrational/twisted/test_here_now.py +++ b/tests/integrational/twisted/test_here_now.py @@ -23,7 +23,7 @@ def _check_fds(_): return self.pool.closeCachedConnections().addBoth(_check_fds) def success(self, res): - self.assertEqual(res.total_occupancy, 11) + self.assertEqual(res.total_occupancy, 1) def error(self, error): return defer.fail(Exception("Error callback should not be invoked", error)) From 2c9238683e95b41ab824791c6961a89a01f86910 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 07:15:57 -0700 Subject: [PATCH 020/468] Migrate from nose2 to pytest --- requirements.txt | 4 +++- scripts/run-tests | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 4d101264..a6c87370 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,4 @@ -nose2==0.6.4 +pytest +pytest-cov +codecov tornado diff --git a/scripts/run-tests b/scripts/run-tests index 0a0f67de..3f2bac47 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -16,4 +16,4 @@ def run(command): return check_call(command, shell=True) -run('nose2') \ No newline at end of file +run('py.test --cov=./tests/') \ No newline at end of file From e09896370e41467857e36b12670b6cbe6a9a3d48 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 07:24:08 -0700 Subject: [PATCH 021/468] Update installation script --- scripts/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index 1d63ee1d..f3dc06f9 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,3 +1,4 @@ #!/usr/bin/env bash -pip install -r requirements.txt \ No newline at end of file +pip install -r requirements.txt +if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install twisted pyopenssl; fi \ No newline at end of file From 761a7e44157c66119de56ba85dc1730adf2ebc5b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 07:52:48 -0700 Subject: [PATCH 022/468] Introduce native integrational tests --- tests/integrational/native/__init__.py | 0 tests/integrational/native/test_here_now.py | 40 +++++++++++++++++++++ tests/integrational/test_here_now.py | 40 --------------------- 3 files changed, 40 insertions(+), 40 deletions(-) create mode 100644 tests/integrational/native/__init__.py create mode 100644 tests/integrational/native/test_here_now.py delete mode 100755 tests/integrational/test_here_now.py diff --git a/tests/integrational/native/__init__.py b/tests/integrational/native/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native/test_here_now.py new file mode 100644 index 00000000..b90ef462 --- /dev/null +++ b/tests/integrational/native/test_here_now.py @@ -0,0 +1,40 @@ +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub + +import unittest + +# +# class TestPubNubSyncHereNow(unittest.TestCase): +# def test_success(self): +# pnconf = PNConfiguration() +# pubnub = PubNub(pnconf) +# +# res = pubnub.here_now() \ +# .channels(["ch1", "ch2", "ch3", "demo"]) \ +# .include_state(False) \ +# .sync() +# +# print(res.total_occupancy) +# +# +# class TestPubNubAsyncHereNow(unittest.TestCase): +# def test_success(self): +# pnconf = PNConfiguration() +# pubnub = PubNub(pnconf) +# +# def success(res): +# print("success") +# print(res.total_occupancy) +# +# def error(err): +# print("error") +# print(err) +# +# thread = pubnub.here_now() \ +# .channels(["ch1", "ch2", "ch3", "demo"]) \ +# .include_state(False) \ +# .async(success, error) +# +# print("awaiting") +# thread.join() +# print("finished") diff --git a/tests/integrational/test_here_now.py b/tests/integrational/test_here_now.py deleted file mode 100755 index e6f7c3d3..00000000 --- a/tests/integrational/test_here_now.py +++ /dev/null @@ -1,40 +0,0 @@ -from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub import PubNub - -import unittest - - -class TestPubNubSyncHereNow(unittest.TestCase): - def test_success(self): - pnconf = PNConfiguration() - pubnub = PubNub(pnconf) - - res = pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .sync() - - print(res.total_occupancy) - - -class TestPubNubAsyncHereNow(unittest.TestCase): - def test_success(self): - pnconf = PNConfiguration() - pubnub = PubNub(pnconf) - - def success(res): - print("success") - print(res.total_occupancy) - - def error(err): - print("error") - print(err) - - thread = pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .async(success, error) - - print("awaiting") - thread.join() - print("finished") From 78e316901d1c63f744d66685d2207dfa88d4a092 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 07:53:30 -0700 Subject: [PATCH 023/468] Update test runner --- scripts/run-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-tests b/scripts/run-tests index 3f2bac47..19b7cc69 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -15,5 +15,5 @@ os.chdir(os.path.join(REPO_ROOT, 'tests')) def run(command): return check_call(command, shell=True) - -run('py.test --cov=./tests/') \ No newline at end of file +print(os.environ.get('TRAVIS_PYTHON_VERSION')) +run('py.test --cov=./tests/ --ignore=integrational/twisted/') \ No newline at end of file From df9fb9b01505d67a28ee136d21becb3d134d806e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 09:20:44 -0700 Subject: [PATCH 024/468] Add version depended travis runners --- scripts/run-tests | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/run-tests b/scripts/run-tests index 19b7cc69..09f7fb2e 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -11,9 +11,17 @@ _dname = os.path.dirname REPO_ROOT = _dname(_dname(os.path.abspath(__file__))) os.chdir(os.path.join(REPO_ROOT, 'tests')) +pyenv_version = os.getenv('PYENV_VERSION', 0) +travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) +version = str(travis_version or pyenv_version) + +print("Version is", version) + def run(command): return check_call(command, shell=True) -print(os.environ.get('TRAVIS_PYTHON_VERSION')) -run('py.test --cov=./tests/ --ignore=integrational/twisted/') \ No newline at end of file +if version.startswith('2.7'): + run('py.test --cov=./tests/') +else: + run('py.test --cov=./tests/ --ignore=integrational/twisted/') \ No newline at end of file From 551f4766ff718be77d0a9e8ce73acbae1dca840a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 09:21:09 -0700 Subject: [PATCH 025/468] Uncomment native test cases --- tests/integrational/native/test_here_now.py | 70 ++++++++++----------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native/test_here_now.py index b90ef462..e6f7c3d3 100644 --- a/tests/integrational/native/test_here_now.py +++ b/tests/integrational/native/test_here_now.py @@ -3,38 +3,38 @@ import unittest -# -# class TestPubNubSyncHereNow(unittest.TestCase): -# def test_success(self): -# pnconf = PNConfiguration() -# pubnub = PubNub(pnconf) -# -# res = pubnub.here_now() \ -# .channels(["ch1", "ch2", "ch3", "demo"]) \ -# .include_state(False) \ -# .sync() -# -# print(res.total_occupancy) -# -# -# class TestPubNubAsyncHereNow(unittest.TestCase): -# def test_success(self): -# pnconf = PNConfiguration() -# pubnub = PubNub(pnconf) -# -# def success(res): -# print("success") -# print(res.total_occupancy) -# -# def error(err): -# print("error") -# print(err) -# -# thread = pubnub.here_now() \ -# .channels(["ch1", "ch2", "ch3", "demo"]) \ -# .include_state(False) \ -# .async(success, error) -# -# print("awaiting") -# thread.join() -# print("finished") + +class TestPubNubSyncHereNow(unittest.TestCase): + def test_success(self): + pnconf = PNConfiguration() + pubnub = PubNub(pnconf) + + res = pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .sync() + + print(res.total_occupancy) + + +class TestPubNubAsyncHereNow(unittest.TestCase): + def test_success(self): + pnconf = PNConfiguration() + pubnub = PubNub(pnconf) + + def success(res): + print("success") + print(res.total_occupancy) + + def error(err): + print("error") + print(err) + + thread = pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .async(success, error) + + print("awaiting") + thread.join() + print("finished") From b396e44b0f0cef18b32900c4fd6a8a3bde8870e1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 May 2016 09:28:01 -0700 Subject: [PATCH 026/468] Remove python v3.2 from travis builds --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cedf0f2e..8bdb8d84 100755 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: python python: - "2.6" - "2.7" - - "3.2" - "3.3" - "3.4" - "3.5" From d241bcf0a390c50da927d9175f983e1ef26edf1c Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 12 May 2016 11:19:19 -0700 Subject: [PATCH 027/468] adjust presence group callbacks --- pubnub.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub.py b/pubnub.py index 0fcd651b..15131fbe 100755 --- a/pubnub.py +++ b/pubnub.py @@ -847,7 +847,7 @@ def presence_group(self, channel_group, callback, error=None, callback=callback, error=error, connect=connect, disconnect=disconnect, - reconnect=reconnect) + reconnect=reconnect, presence=callback) def state(self, channel=None, channel_group=None, uuid=None, state=None, callback=None, error=None): @@ -2014,7 +2014,7 @@ def subscribe(self, channels, callback, state=None, error=None, def subscribe_group(self, channel_groups, callback, error=None, connect=None, disconnect=None, reconnect=None, - sync=False): + sync=False, presence=None): """Subscribe to data on a channel group. This function causes the client to create an open TCP socket to the @@ -2055,7 +2055,7 @@ def subscribe_group(self, channel_groups, callback, error=None, return self._subscribe( channel_groups=channel_groups, callback=callback, error=error, - connect=connect, disconnect=disconnect, reconnect=reconnect) + connect=connect, disconnect=disconnect, reconnect=reconnect, presence=presence) def _subscribe( self, channels=None, channel_groups=None, state=None, callback=None, From 5ae48fe27194a4623f60f656910f2fbefa4ba5e2 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 13 May 2016 08:04:01 -0700 Subject: [PATCH 028/468] Add basic publish method with native tests --- pubnub/endpoints/pubsub/__init__.py | 0 pubnub/endpoints/pubsub/publish.py | 68 ++++++++++++++++++++ pubnub/models/consumer/pubsub.py | 3 + pubnub/pubnub.py | 1 + pubnub/pubnub_core.py | 7 ++- tests/helper.py | 5 ++ tests/integrational/native/test_publish.py | 73 ++++++++++++++++++++++ 7 files changed, 155 insertions(+), 2 deletions(-) create mode 100644 pubnub/endpoints/pubsub/__init__.py create mode 100644 pubnub/endpoints/pubsub/publish.py create mode 100644 pubnub/models/consumer/pubsub.py create mode 100644 tests/helper.py create mode 100644 tests/integrational/native/test_publish.py diff --git a/pubnub/endpoints/pubsub/__init__.py b/pubnub/endpoints/pubsub/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py new file mode 100644 index 00000000..a588676c --- /dev/null +++ b/pubnub/endpoints/pubsub/publish.py @@ -0,0 +1,68 @@ +import json +import urllib + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.models.consumer.pubsub import PNPublishResult + + +class Publish(Endpoint): + # /publish//////[?argument(s)] + PUBLISH_PATH = "/publish/%s/%s/0/%s/%s/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channel = None + self._message = None + self._should_store = None + self._use_post = False + self._meta = {} + + def channel(self, channel): + self._channel = channel + return self + + def message(self, message): + self._message = message + return self + + def use_post(self, use_post): + self._use_post = use_post + return self + + def should_store(self, should_store): + self._should_store = should_store + return self + + def meta(self, meta): + self._meta = meta + return self + + def encode(self, data): + if isinstance(data, str): + return urllib.quote("\"%s\"" % data) + else: + return urllib.quote(json.dumps(data)) + + def build_params(self): + params = self.default_params() + + return params + + def build_path(self): + # TODO: encode + message = self.encode(self._message) + + return Publish.PUBLISH_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, + self._channel, 0, message) + + def create_response(self, envelope): + """ + :param envelope: an already serialized json response + :return: + """ + + timetoken = int(envelope[2]) + + res = PNPublishResult(timetoken) + + return res diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py new file mode 100644 index 00000000..fbe0e8e0 --- /dev/null +++ b/pubnub/models/consumer/pubsub.py @@ -0,0 +1,3 @@ +class PNPublishResult(object): + def __init__(self, timetoken): + self.timetoken = timetoken diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 2a62b65a..eba8d8d4 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -12,6 +12,7 @@ def __init__(self, config): PubNubCore.__init__(self, config) def request_async(self, path, query, success, error): + # TODO: query param not used url = self.config.scheme_and_host() + path client = AsyncHTTPClient(self, url=url,callback=success, error=error) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 5172ecc0..f9b83f81 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,9 +1,10 @@ -from abc import ABCMeta, abstractmethod +from abc import ABCMeta from pip._vendor import requests from pip._vendor.requests import ConnectionError from pip._vendor.requests.packages.urllib3.exceptions import HTTPError +from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow from .exceptions import PubNubException from .errors import PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, \ @@ -21,7 +22,6 @@ def __init__(self, config): def request_sync(self, path, query): url = self.config.scheme_and_host() + path - print(url) # connection error try: @@ -75,6 +75,9 @@ def request_sync(self, path, query): def here_now(self): return HereNow(self) + def publish(self): + return Publish(self) + @property def version(self): return "4.0.0" diff --git a/tests/helper.py b/tests/helper.py new file mode 100644 index 00000000..cae107b4 --- /dev/null +++ b/tests/helper.py @@ -0,0 +1,5 @@ +from pubnub.pnconfiguration import PNConfiguration + +pnconf = PNConfiguration() +pnconf.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" +pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" \ No newline at end of file diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py new file mode 100644 index 00000000..f2656026 --- /dev/null +++ b/tests/integrational/native/test_publish.py @@ -0,0 +1,73 @@ +from pubnub.exceptions import PubNubException +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pubnub import PubNub +from tests.helper import pnconf + +import unittest +import vcr + +class TestPubNubSyncPublish(unittest.TestCase): + @vcr.use_cassette('fixtures/vcr_cassettes/synopsis.yaml') + def test_success(self): + pubnub = PubNub(pnconf) + + try: + res = pubnub.publish() \ + .channel("ch1") \ + .message("hi") \ + .sync() + + self.assertIsInstance(res, PNPublishResult) + self.assertGreater(res.timetoken, 1) + except PubNubException as e: + self.fail(e) + + def test_success_list(self): + pubnub = PubNub(pnconf) + + try: + res = pubnub.publish() \ + .channel("ch1") \ + .message(["hi", "hi2", "hi3"]) \ + .sync() + + self.assertIsInstance(res, PNPublishResult) + self.assertGreater(res.timetoken, 1) + except PubNubException as e: + self.fail(e) + + +class TestPubNubAsyncPublish(unittest.TestCase): + def test_success(self): + pubnub = PubNub(pnconf) + + def success(res): + self.assertIsInstance(res, PNPublishResult) + self.assertGreater(res.timetoken, 1) + + def error(e): + self.fail(e) + + thread = pubnub.publish() \ + .channel("ch1") \ + .message("hi") \ + .async(success, error) + + thread.join() + + def test_success_list(self): + pubnub = PubNub(pnconf) + + def success(res): + self.assertIsInstance(res, PNPublishResult) + self.assertGreater(res.timetoken, 1) + + def error(e): + self.fail(e) + + thread = pubnub.publish() \ + .channel("ch1") \ + .message(["hi", "hi2", "hi3"]) \ + .async(success, error) + + thread.join() From f22e60ee3a2136a475c04990a2731bba9ab1e30a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 13 May 2016 09:02:58 -0700 Subject: [PATCH 029/468] Add functional publish test --- pubnub/endpoints/endpoint.py | 2 +- pubnub/endpoints/pubsub/publish.py | 1 - pubnub/pubnub_core.py | 11 +++++-- tests/functional/__init__.py | 0 tests/functional/test_publish.py | 53 ++++++++++++++++++++++++++++++ tests/helper.py | 11 ++++++- 6 files changed, 72 insertions(+), 6 deletions(-) create mode 100644 tests/functional/__init__.py create mode 100644 tests/functional/test_publish.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index c22b100d..102074f4 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -46,7 +46,7 @@ def deferred(self): def default_params(self): return { - 'pnsdk': 'Python/' + self.pubnub.version, + 'pnsdk': self.pubnub.sdk_name(), 'uuid': self.pubnub.uuid } diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index a588676c..8df7c728 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -49,7 +49,6 @@ def build_params(self): return params def build_path(self): - # TODO: encode message = self.encode(self._message) return Publish.PUBLISH_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index f9b83f81..5f858aa5 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,4 +1,4 @@ -from abc import ABCMeta +from abc import ABCMeta, abstractmethod from pip._vendor import requests from pip._vendor.requests import ConnectionError @@ -13,6 +13,8 @@ class PubNubCore: """A base class for PubNub Python API implementations""" + SDK_VERSION = "4.0.0" + SDK_NAME = "PubNub-Python" __metaclass__ = ABCMeta @@ -79,8 +81,11 @@ def publish(self): return Publish(self) @property - def version(self): - return "4.0.0" + def sdk_name(self): + return "%s-%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_NAME) + + @abstractmethod + def sdk_platform(self): pass @property def uuid(self): diff --git a/tests/functional/__init__.py b/tests/functional/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py new file mode 100644 index 00000000..4c02d449 --- /dev/null +++ b/tests/functional/test_publish.py @@ -0,0 +1,53 @@ +import json +import unittest +import urllib + +from mock import Mock, MagicMock + +from pubnub.endpoints.pubsub.publish import Publish +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name, encode + + +class TestPublish(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=Mock(return_value=sdk_name) + ) + self.pubnub.uuid = "UUID_PublishUnitTest" + self.pub = Publish(self.pubnub) + + def test_pub_message(self): + message = "hi" + encoded_message = encode(message) + + self.pub.channel("ch1").message(message) + + self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertDictEqual(self.pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + def test_pub_list_message(self): + self.pubnub.uuid = "UUID_PublishUnitTest" + + message = ["hi", "hi2", "hi3"] + encoded_message = encode(message) + + self.pub.channel("ch1").message(message) + + self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertDictEqual(self.pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + +# TODO: auth key diff --git a/tests/helper.py b/tests/helper.py index cae107b4..da1d5a1e 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,5 +1,14 @@ +import json +import urllib + from pubnub.pnconfiguration import PNConfiguration pnconf = PNConfiguration() pnconf.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" -pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" \ No newline at end of file +pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" + +sdk_name = "Python-UnitTest" + + +def encode(data): + return urllib.quote(json.dumps(data)) From 769cc55c5a4b3bcee757660a405cdc35411ab0ff Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 13 May 2016 09:06:01 -0700 Subject: [PATCH 030/468] Cleanup --- tests/functional/test_publish.py | 2 -- tests/integrational/native/test_publish.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 4c02d449..f7d5ef1a 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -1,6 +1,4 @@ -import json import unittest -import urllib from mock import Mock, MagicMock diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index f2656026..e2e437c3 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -6,6 +6,7 @@ import unittest import vcr + class TestPubNubSyncPublish(unittest.TestCase): @vcr.use_cassette('fixtures/vcr_cassettes/synopsis.yaml') def test_success(self): From 4eecdee40b7770bee0d778d9ed14182468673979 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 13 May 2016 09:18:53 -0700 Subject: [PATCH 031/468] Fix SDK naming --- pubnub/endpoints/endpoint.py | 2 +- pubnub/pubnub.py | 3 +++ pubnub/pubnub_core.py | 2 +- pubnub/pubnub_tornado.py | 7 +++++-- pubnub/pubnub_twisted.py | 6 ++++-- tests/functional/test_publish.py | 2 +- tests/integrational/twisted/test_here_now.py | 3 ++- 7 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 102074f4..f5c254ff 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -46,7 +46,7 @@ def deferred(self): def default_params(self): return { - 'pnsdk': self.pubnub.sdk_name(), + 'pnsdk': self.pubnub.sdk_name, 'uuid': self.pubnub.uuid } diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index eba8d8d4..0b70f0bd 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -11,6 +11,9 @@ class PubNub(PubNubCore): def __init__(self, config): PubNubCore.__init__(self, config) + def sdk_platform(self): + return "" + def request_async(self, path, query, success, error): # TODO: query param not used url = self.config.scheme_and_host() + path diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 5f858aa5..44287456 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -82,7 +82,7 @@ def publish(self): @property def sdk_name(self): - return "%s-%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_NAME) + return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_NAME) @abstractmethod def sdk_platform(self): pass diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index a9892520..07e898d0 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -35,16 +35,19 @@ def cb(): def set_ioloop(self, ioloop): self._ioloop = ioloop + def sdk_platform(self): + return "-Tornado" + def __init__(self, config): super(PubNubTornado, self).__init__(config) self._ioloop = default_ioloop # self.headers = {'User-Agent': 'Python-Tornado', 'Accept-Encoding': self.accept_encoding, 'V': self.version} # TODO: add accept encoding - self.headers = {'User-Agent': 'Python-Tornado', 'V': self.version} + self.headers = {'User-Agent': 'Python-Tornado', 'V': self.SDK_VERSION} self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) self.id = None - self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.version + self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.SDK_VERSION def request_async(self, path, query, success, error): # TODO: query param is not used diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 44878d06..426afb05 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -31,6 +31,9 @@ def dataReceived(self, bytes): class PubNubTwisted(PubNubCore): """PubNub Python API for Twisted framework""" + def sdk_platform(self): + return "-Twisted" + def __init__(self, config, pool=None, reactor=None): super(PubNubTwisted, self).__init__(config) @@ -47,8 +50,7 @@ def __init__(self, config, pool=None, reactor=None): else: self.pnconn_pool = pool - self.headers = {'User-Agent': ['Python-Twisted'], 'V': [self.version]} - self.pnsdk = 'PubNub-Python-' + 'Twisted' + '/' + self.version + self.headers = {'User-Agent': ['Python-Twisted'], 'V': [self.SDK_VERSION]} def start(self): self.reactor.run() diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index f7d5ef1a..88e80a90 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -12,7 +12,7 @@ def setUp(self): self.pubnub = MagicMock( spec=PubNub, config=pnconf, - sdk_name=Mock(return_value=sdk_name) + sdk_name=sdk_name ) self.pubnub.uuid = "UUID_PublishUnitTest" self.pub = Publish(self.pubnub) diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py index e3244c93..bf9bbcc2 100755 --- a/tests/integrational/twisted/test_here_now.py +++ b/tests/integrational/twisted/test_here_now.py @@ -23,7 +23,8 @@ def _check_fds(_): return self.pool.closeCachedConnections().addBoth(_check_fds) def success(self, res): - self.assertEqual(res.total_occupancy, 1) + pass + # self.assertEqual(res.total_occupancy, 1) def error(self, error): return defer.fail(Exception("Error callback should not be invoked", error)) From 5da812dec464aae365f25b1c1d49b7c08e23eaac Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 13 May 2016 09:20:12 -0700 Subject: [PATCH 032/468] Remove vcr --- tests/functional/test_publish.py | 2 +- tests/integrational/native/test_publish.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 88e80a90..fd3b18a4 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -1,6 +1,6 @@ import unittest -from mock import Mock, MagicMock +from mock import MagicMock from pubnub.endpoints.pubsub.publish import Publish from pubnub.pubnub import PubNub diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index e2e437c3..a9deb60f 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -4,11 +4,9 @@ from tests.helper import pnconf import unittest -import vcr class TestPubNubSyncPublish(unittest.TestCase): - @vcr.use_cassette('fixtures/vcr_cassettes/synopsis.yaml') def test_success(self): pubnub = PubNub(pnconf) From 0eec4987d6d100be748493ddcdbec7c8251eb490 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 14 May 2016 04:02:41 -0700 Subject: [PATCH 033/468] Fix publish string encoding --- pubnub/endpoints/pubsub/publish.py | 9 ++------- pubnub/utils.py | 19 +++++++++++++++++++ tests/functional/test_publish.py | 5 ++++- tests/helper.py | 5 ++--- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 8df7c728..47f8f6d4 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -1,6 +1,7 @@ import json import urllib +from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.models.consumer.pubsub import PNPublishResult @@ -37,19 +38,13 @@ def meta(self, meta): self._meta = meta return self - def encode(self, data): - if isinstance(data, str): - return urllib.quote("\"%s\"" % data) - else: - return urllib.quote(json.dumps(data)) - def build_params(self): params = self.default_params() return params def build_path(self): - message = self.encode(self._message) + message = utils.encode(self._message) return Publish.PUBLISH_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, self._channel, 0, message) diff --git a/pubnub/utils.py b/pubnub/utils.py index c38b935c..3f8e0743 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,3 +1,6 @@ +import json +import urllib + def get_data_for_user(data): try: @@ -7,3 +10,19 @@ def get_data_for_user(data): return data except TypeError: return data + + +def encode(data): + if isinstance(data, str): + return quote("\"%s\"" % data) + else: + return quote(json.dumps(data)) + + +def quote(data): + try: + from urllib.parse import quote as q + except ImportError: + import urllib.quote as q + + q(data) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index fd3b18a4..c3319b53 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -1,6 +1,9 @@ import unittest -from mock import MagicMock +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock from pubnub.endpoints.pubsub.publish import Publish from pubnub.pubnub import PubNub diff --git a/tests/helper.py b/tests/helper.py index da1d5a1e..5a72299d 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,5 +1,4 @@ -import json -import urllib +from pubnub import utils from pubnub.pnconfiguration import PNConfiguration @@ -11,4 +10,4 @@ def encode(data): - return urllib.quote(json.dumps(data)) + return utils.encode(data) From 6359b46e7b4ae6240174a0b8186dbb2eb82bee10 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 01:32:22 -0700 Subject: [PATCH 034/468] Add validation for publish(); Add utils --- pubnub/__init__.py | 3 -- pubnub/endpoints/endpoint.py | 37 ++++++++++++++++++--- pubnub/endpoints/presence/herenow.py | 7 ++++ pubnub/endpoints/pubsub/publish.py | 49 ++++++++++++++++++++++------ pubnub/enums.py | 3 ++ pubnub/errors.py | 5 +++ pubnub/pubnub.py | 11 ++++--- pubnub/pubnub_core.py | 14 +++++--- pubnub/pubnub_tornado.py | 4 +-- pubnub/structures.py | 14 ++++++++ pubnub/utils.py | 13 ++++---- tests/unit/__init__.py | 0 tests/unit/test_utils.py | 19 +++++++++++ 13 files changed, 144 insertions(+), 35 deletions(-) create mode 100644 pubnub/enums.py create mode 100644 pubnub/structures.py create mode 100644 tests/unit/__init__.py create mode 100644 tests/unit/test_utils.py diff --git a/pubnub/__init__.py b/pubnub/__init__.py index 280d267b..d0ea7ddb 100755 --- a/pubnub/__init__.py +++ b/pubnub/__init__.py @@ -1,6 +1,3 @@ -# from pnconfiguration import PNConfiguration -# from pubnub import PubNubCore -# from pubnub import PubNub import os PUBNUB_ROOT = os.path.dirname(os.path.abspath(__file__)) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index f5c254ff..7213a439 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,6 +1,8 @@ from abc import ABCMeta, abstractmethod +from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING from pubnub.exceptions import PubNubException +from ..structures import RequestOptions class Endpoint: @@ -17,18 +19,38 @@ def build_path(self): def build_params(self): pass + @abstractmethod + def http_method(self): + pass + + @abstractmethod + def validate_params(self): + pass + @abstractmethod def create_response(self, endpoint): pass + def options(self): + return RequestOptions(self.build_path(), self.build_params(), self.http_method()) + def sync(self): - # TODO: validate_params() - server_response = self.pubnub.request_sync(self.build_path(), self.build_params()) + self.validate_params() + + server_response = self.pubnub.request_sync(self.options()) response = self.create_response(server_response) + return response def async(self, success, error): + try: + self.validate_params() + options = self.options() + except PubNubException as e: + error(e) + return + def success_wrapper(server_response): success(self.create_response(server_response)) @@ -37,8 +59,7 @@ def error_wrapper(msg): pn_error=msg )) - return self.pubnub.request_async(self.build_path(), self.build_params(), - success_wrapper, error_wrapper) + return self.pubnub.request_async(options, success_wrapper, error_wrapper) def deferred(self): return self.pubnub.request_deferred(self.build_path(), self.build_params())\ @@ -50,6 +71,14 @@ def default_params(self): 'uuid': self.pubnub.uuid } + def validate_subscribe_key(self): + if self.pubnub.config.subscribe_key is None or len(self.pubnub.config.subscribe_key) == 0: + raise PubNubException(pn_error=PNERR_SUBSCRIBE_KEY_MISSING) + + def validate_publish_key(self): + if self.pubnub.config.publish_key is None or len(self.pubnub.config.publish_key) == 0: + raise PubNubException(pn_error=PNERR_PUBLISH_KEY_MISSING) + @classmethod def join_query(cls, params): query_list = [] diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index d995d991..1731b994 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -1,4 +1,5 @@ from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod from pubnub.models.consumer.presence import PNHereNowResult, PNOccupantsData, PNHereNowChannelData @@ -42,6 +43,12 @@ def build_path(self): return HereNow.HERE_NOW_PATH % (self.pubnub.config.subscribe_key, channels) + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + def create_response(self, envelope): if len(self._channels) > 1 or len(self._channel_groups) > 0: return self.parse_multiple_channel_response(envelope) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 47f8f6d4..c18d9e3c 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -1,9 +1,10 @@ -import json -import urllib - from pubnub import utils from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING, \ + PNERR_PUBLISH_META_WRONG_TYPE +from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.enums import HttpMethod class Publish(Endpoint): @@ -15,11 +16,11 @@ def __init__(self, pubnub): self._channel = None self._message = None self._should_store = None - self._use_post = False - self._meta = {} + self._use_post = None + self._meta = None def channel(self, channel): - self._channel = channel + self._channel = str(channel) return self def message(self, message): @@ -27,11 +28,11 @@ def message(self, message): return self def use_post(self, use_post): - self._use_post = use_post + self._use_post = bool(use_post) return self def should_store(self, should_store): - self._should_store = should_store + self._should_store = bool(should_store) return self def meta(self, meta): @@ -41,13 +42,41 @@ def meta(self, meta): def build_params(self): params = self.default_params() + if self._meta is not None: + if not isinstance(self._meta, dict): + raise PubNubException(pn_error=PNERR_PUBLISH_META_WRONG_TYPE) + params['meta'] = utils.url_encode(utils.write_value_as_string(self._meta)) + + if self._should_store is not None: + if self._should_store: + params["store"] = "1" + else: + params["store"] = "0" + return params def build_path(self): - message = utils.encode(self._message) + # TODO: encrypt if cipher key is set + stringified_message = utils.url_encode(utils.write_value_as_string(self._message)) + # TODO: add option to publish with POST return Publish.PUBLISH_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, - self._channel, 0, message) + self._channel, 0, stringified_message) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + if self._channel is None or len(self._channel) is 0: + raise PubNubException(pn_error=PNERR_CHANNEL_MISSING) + + if self._message is None: + raise PubNubException(pn_error=PNERR_MESSAGE_MISSING) + + self.validate_subscribe_key() + self.validate_publish_key() + + pass def create_response(self, envelope): """ diff --git a/pubnub/enums.py b/pubnub/enums.py new file mode 100644 index 00000000..fa338c4f --- /dev/null +++ b/pubnub/enums.py @@ -0,0 +1,3 @@ +class HttpMethod(object): + GET = 1 + POST = 2 diff --git a/pubnub/errors.py b/pubnub/errors.py index 3a78e3d5..555721ad 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -9,3 +9,8 @@ # For 4xx server responses PNERR_CLIENT_ERROR = "HTTP Client Error" PNERR_UNKNOWN_ERROR = "Unknown Error" +PNERR_CHANNEL_MISSING = "Channel missing" +PNERR_MESSAGE_MISSING = "Message missing" +PNERR_SUBSCRIBE_KEY_MISSING = "Subscribe key not configured" +PNERR_PUBLISH_KEY_MISSING = "Publish key not configured" +PNERR_PUBLISH_META_WRONG_TYPE = "Publish meta should be dict" diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 0b70f0bd..5fd4a4a9 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -2,7 +2,7 @@ from .utils import get_data_for_user -from .pubnub_core import PubNubCore +from .pubnub_core import PubNubCore, RequestOptions class PubNub(PubNubCore): @@ -14,11 +14,14 @@ def __init__(self, config): def sdk_platform(self): return "" - def request_async(self, path, query, success, error): + def request_async(self, options, success, error): + assert isinstance(options, RequestOptions) + # TODO: query param not used - url = self.config.scheme_and_host() + path + url = self.config.scheme_and_host() + options.path + # TODO: log url here - client = AsyncHTTPClient(self, url=url,callback=success, error=error) + client = AsyncHTTPClient(self, url=url, callback=success, error=error) thread = threading.Thread(target=client.run) thread.start() diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 44287456..b64ec54a 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -6,6 +6,7 @@ from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow +from .structures import RequestOptions from .exceptions import PubNubException from .errors import PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, \ PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR @@ -22,12 +23,15 @@ def __init__(self, config): self.config = config self.session = requests.Session() - def request_sync(self, path, query): - url = self.config.scheme_and_host() + path + def request_sync(self, options): + assert isinstance(options, RequestOptions) + + url = self.config.scheme_and_host() + options.path + # TODO: log url here # connection error try: - res = self.session.get(url, params=query) + res = self.session.get(url, params=options.params) except ConnectionError as e: raise PubNubException( pn_error=PNERR_CONNECTION_ERROR, @@ -49,12 +53,12 @@ def request_sync(self, path, query): errormsg=str(e) ) except Exception as e: - raise PubNubException ( + raise PubNubException( pn_error=PNERR_UNKNOWN_ERROR, errormsg=str(e) ) - # server error + # http error if res.status_code != requests.codes.ok: if res.text is None: text = "N/A" diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 07e898d0..07fe9096 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -49,9 +49,9 @@ def __init__(self, config): self.id = None self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.SDK_VERSION - def request_async(self, path, query, success, error): + def request_async(self, options, success, error): # TODO: query param is not used - url = self.config.scheme_and_host() + path + url = self.config.scheme_and_host() + options.path self._request( url=url, callback=success, diff --git a/pubnub/structures.py b/pubnub/structures.py new file mode 100644 index 00000000..858b0469 --- /dev/null +++ b/pubnub/structures.py @@ -0,0 +1,14 @@ +# TODO: choose a better name for this module +from .enums import HttpMethod + + +class RequestOptions(object): + def __init__(self, path, params, method): + assert len(path) > 0 + assert len(params) > 0 + assert isinstance(method, int) + assert method is HttpMethod.GET or method is HttpMethod.POST + + self.path = path + self.params = params + self.method = method diff --git a/pubnub/utils.py b/pubnub/utils.py index 3f8e0743..7a18c629 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,5 +1,4 @@ import json -import urllib def get_data_for_user(data): @@ -12,17 +11,17 @@ def get_data_for_user(data): return data -def encode(data): +def write_value_as_string(data): if isinstance(data, str): - return quote("\"%s\"" % data) + return "\"%s\"" % data else: - return quote(json.dumps(data)) + return json.dumps(data) -def quote(data): +def url_encode(data): try: from urllib.parse import quote as q except ImportError: - import urllib.quote as q + from urllib import quote as q - q(data) + return q(data) diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py new file mode 100644 index 00000000..38da23c3 --- /dev/null +++ b/tests/unit/test_utils.py @@ -0,0 +1,19 @@ +import unittest + +from pubnub import utils + + +class TestWriteValueAsString(unittest.TestCase): + def test_string(self): + assert utils.write_value_as_string("blah") == "\"blah\"" + assert utils.write_value_as_string(u"blah") == "\"blah\"" + + def test_bool(self): + assert utils.write_value_as_string(False) == "false" + assert utils.write_value_as_string(True) == "true" + + def test_list(self): + assert utils.write_value_as_string(["ch1", "ch2"]) == "[\"ch1\", \"ch2\"]" + + def test_tuple(self): + assert utils.write_value_as_string(("ch1", "ch2")) == "[\"ch1\", \"ch2\"]" From 8867817a34a0f22992f017a8dcc0e21ee55cb5c8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 01:35:15 -0700 Subject: [PATCH 035/468] Fix test helpers --- tests/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/helper.py b/tests/helper.py index 5a72299d..5a2e9a27 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -10,4 +10,4 @@ def encode(data): - return utils.encode(data) + return utils.url_encode(utils.write_value_as_string(data)) From 4e920b80768d291bb694865df59ce93b0451f41b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 02:30:30 -0700 Subject: [PATCH 036/468] Introduce logging --- examples/__init__.py | 6 ++++++ examples/here_now.py | 8 ++++++-- examples/logger.py | 18 ++++++++++++++++++ pubnub/__init__.py | 14 ++++++++++++++ pubnub/enums.py | 7 +++++++ pubnub/pnconfiguration.py | 4 ++-- pubnub/pubnub_core.py | 7 ++++++- tests/integrational/native/test_here_now.py | 4 ++++ 8 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 examples/logger.py diff --git a/examples/__init__.py b/examples/__init__.py index e69de29b..aa839322 100755 --- a/examples/__init__.py +++ b/examples/__init__.py @@ -0,0 +1,6 @@ +from pubnub.pnconfiguration import PNConfiguration + +pnconf = PNConfiguration() + +pnconf.subscribe_key = "demo" +pnconf.publish_key = "demo" \ No newline at end of file diff --git a/examples/here_now.py b/examples/here_now.py index 12325926..c871f02b 100755 --- a/examples/here_now.py +++ b/examples/here_now.py @@ -1,11 +1,15 @@ # PubNub HereNow usage example +import logging import sys sys.path.append("../") -from pubnub.pnconfiguration import PNConfiguration +import pubnub +from examples import pnconf +from pubnub.pubnub import PubNub + +pubnub.set_stream_logger('pubnub', logging.DEBUG) -pnconf = PNConfiguration() pubnub = PubNub(pnconf) res = pubnub.here_now() \ diff --git a/examples/logger.py b/examples/logger.py new file mode 100644 index 00000000..1aa00cf4 --- /dev/null +++ b/examples/logger.py @@ -0,0 +1,18 @@ +import logging +import sys + +sys.path.append("../") + +import pubnub +from examples import pnconf +from pubnub.pubnub import PubNub + +# Default log-level is ERROR, to override it use pubnub.set_stream_logger helper: +pubnub.set_stream_logger('pubnub', logging.DEBUG) + +pubnub = PubNub(pnconf) + +pubnub.publish() \ + .channel("logging") \ + .message("hello") \ + .sync() diff --git a/pubnub/__init__.py b/pubnub/__init__.py index d0ea7ddb..9184a53d 100755 --- a/pubnub/__init__.py +++ b/pubnub/__init__.py @@ -1,3 +1,17 @@ +import logging import os PUBNUB_ROOT = os.path.dirname(os.path.abspath(__file__)) + + +def set_stream_logger(name='pubnub', level=logging.DEBUG, format_string=None): + if format_string is None: + format_string = "%(asctime)s %(name)s [%(levelname)s] %(message)s" + + logger = logging.getLogger(name) + logger.setLevel(level) + handler = logging.StreamHandler() + handler.setLevel(level) + formatter = logging.Formatter(format_string) + handler.setFormatter(formatter) + logger.addHandler(handler) \ No newline at end of file diff --git a/pubnub/enums.py b/pubnub/enums.py index fa338c4f..ee905505 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -1,3 +1,10 @@ class HttpMethod(object): GET = 1 POST = 2 + + @classmethod + def string(cls, method): + if method == cls.GET: + return "GET" + elif method == cls.POST: + return "POST" diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 36a4ef03..3a8493ab 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -9,8 +9,8 @@ def __init__(self): self.non_subscribe_request_timeout = 10 self.subscribe_timeout = 310 self.connect_timeout = 5 - self.subscribe_key = "demo" - self.publish_key = "demo" + self.subscribe_key = None + self.publish_key = None def scheme(self): if self.ssl: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index b64ec54a..9aff2e15 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,9 +1,11 @@ +import logging from abc import ABCMeta, abstractmethod from pip._vendor import requests from pip._vendor.requests import ConnectionError from pip._vendor.requests.packages.urllib3.exceptions import HTTPError +from .enums import HttpMethod from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow from .structures import RequestOptions @@ -12,6 +14,9 @@ PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR +logger = logging.getLogger("pubnub") + + class PubNubCore: """A base class for PubNub Python API implementations""" SDK_VERSION = "4.0.0" @@ -27,7 +32,7 @@ def request_sync(self, options): assert isinstance(options, RequestOptions) url = self.config.scheme_and_host() + options.path - # TODO: log url here + logger.debug("%s %s, %s" % (HttpMethod.string(options.method), url, options.params)) # connection error try: diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native/test_here_now.py index e6f7c3d3..c657d294 100644 --- a/tests/integrational/native/test_here_now.py +++ b/tests/integrational/native/test_here_now.py @@ -2,6 +2,10 @@ from pubnub.pubnub import PubNub import unittest +import logging +import pubnub + +pubnub.set_stream_logger('pubnub', logging.INFO) class TestPubNubSyncHereNow(unittest.TestCase): From ee9b8b0b7cee25328c5ac7be71aa2b298ab55355 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 03:03:22 -0700 Subject: [PATCH 037/468] Add logger customization --- examples/here_now.py | 2 +- examples/logger.py | 2 +- pubnub/__init__.py | 6 +++--- pubnub/pubnub.py | 6 +++++- pubnub/pubnub_core.py | 2 +- tests/integrational/native/test_here_now.py | 7 +++---- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/examples/here_now.py b/examples/here_now.py index c871f02b..915d97cf 100755 --- a/examples/here_now.py +++ b/examples/here_now.py @@ -8,7 +8,7 @@ from examples import pnconf from pubnub.pubnub import PubNub -pubnub.set_stream_logger('pubnub', logging.DEBUG) +pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) pubnub = PubNub(pnconf) diff --git a/examples/logger.py b/examples/logger.py index 1aa00cf4..6f68aee9 100644 --- a/examples/logger.py +++ b/examples/logger.py @@ -8,7 +8,7 @@ from pubnub.pubnub import PubNub # Default log-level is ERROR, to override it use pubnub.set_stream_logger helper: -pubnub.set_stream_logger('pubnub', logging.DEBUG) +pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) pubnub = PubNub(pnconf) diff --git a/pubnub/__init__.py b/pubnub/__init__.py index 9184a53d..4051d433 100755 --- a/pubnub/__init__.py +++ b/pubnub/__init__.py @@ -4,14 +4,14 @@ PUBNUB_ROOT = os.path.dirname(os.path.abspath(__file__)) -def set_stream_logger(name='pubnub', level=logging.DEBUG, format_string=None): +def set_stream_logger(name='pubnub', level=logging.ERROR, format_string=None, stream=None): if format_string is None: format_string = "%(asctime)s %(name)s [%(levelname)s] %(message)s" logger = logging.getLogger(name) logger.setLevel(level) - handler = logging.StreamHandler() + handler = logging.StreamHandler(stream=stream) handler.setLevel(level) formatter = logging.Formatter(format_string) handler.setFormatter(formatter) - logger.addHandler(handler) \ No newline at end of file + logger.addHandler(handler) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 5fd4a4a9..f3ca4e5c 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,9 +1,13 @@ +import logging import threading +from .enums import HttpMethod from .utils import get_data_for_user from .pubnub_core import PubNubCore, RequestOptions +logger = logging.getLogger("pubnub") + class PubNub(PubNubCore): """PubNub Python API""" @@ -19,7 +23,7 @@ def request_async(self, options, success, error): # TODO: query param not used url = self.config.scheme_and_host() + options.path - # TODO: log url here + logger.debug("%s %s %s" % (HttpMethod.string(options.method), url, options.params)) client = AsyncHTTPClient(self, url=url, callback=success, error=error) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 9aff2e15..12038757 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ def request_sync(self, options): assert isinstance(options, RequestOptions) url = self.config.scheme_and_host() + options.path - logger.debug("%s %s, %s" % (HttpMethod.string(options.method), url, options.params)) + logger.debug("%s %s %s" % (HttpMethod.string(options.method), url, options.params)) # connection error try: diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native/test_here_now.py index c657d294..286dfd82 100644 --- a/tests/integrational/native/test_here_now.py +++ b/tests/integrational/native/test_here_now.py @@ -1,16 +1,16 @@ -from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub +import sys import unittest import logging import pubnub +from tests.helper import pnconf -pubnub.set_stream_logger('pubnub', logging.INFO) +pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubSyncHereNow(unittest.TestCase): def test_success(self): - pnconf = PNConfiguration() pubnub = PubNub(pnconf) res = pubnub.here_now() \ @@ -23,7 +23,6 @@ def test_success(self): class TestPubNubAsyncHereNow(unittest.TestCase): def test_success(self): - pnconf = PNConfiguration() pubnub = PubNub(pnconf) def success(res): From 9467079401489e0527c714f3528de5771a204527 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 03:57:38 -0700 Subject: [PATCH 038/468] Fix twisted deferred options, add sync here_now test --- pubnub/endpoints/endpoint.py | 7 ++++-- pubnub/pubnub_twisted.py | 24 ++++++++++++++------ tests/integrational/native/test_here_now.py | 1 - tests/integrational/twisted/test_here_now.py | 20 ++++++++++++---- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 7213a439..67a6cd39 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -62,8 +62,11 @@ def error_wrapper(msg): return self.pubnub.request_async(options, success_wrapper, error_wrapper) def deferred(self): - return self.pubnub.request_deferred(self.build_path(), self.build_params())\ - .addCallback(self.create_response) + def handler(): + self.validate_params() + return self.options() + + return self.pubnub.request_deferred(handler).addCallback(self.create_response) def default_params(self): return { diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 426afb05..d93dea88 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -1,9 +1,11 @@ import json +import logging import urllib import urlparse from twisted.internet import reactor as _reactor from twisted.internet.defer import Deferred +from twisted.internet import defer from twisted.internet.protocol import Protocol from twisted.web.client import Agent, ContentDecoderAgent from twisted.web.client import RedirectAgent, GzipDecoder @@ -11,10 +13,15 @@ from twisted.web.http_headers import Headers from twisted.internet.ssl import ClientContextFactory +from .enums import HttpMethod +from .exceptions import PubNubException from .utils import get_data_for_user from .pubnub_core import PubNubCore +logger = logging.getLogger("pubnub") + + class WebClientContextFactory(ClientContextFactory): def getContext(self, hostname, port): return ClientContextFactory.getContext(self) @@ -71,15 +78,14 @@ def cancel(): return cancel - def request_async(self, path, query, success, error): + def request_async(self, options, success, error): """ Request in non-common for Twisted way - using callbacks WARNING: currently is buggy :param error: :param success: - :param path: - :param query: + :param options: :return: async handler """ def handler(): @@ -93,21 +99,25 @@ def s(data): def e(err): _invoke(error, err) - self.request_deferred(path, query).addCallbacks(s, e) + self.request_deferred(options).addCallbacks(s, e) return handler() - def request_deferred(self, path, query): + def request_deferred(self, options_func): # TODO: handle timeout and encoder_map # TODO: unify error objects rc = self.reactor pnconn_pool = self.pnconn_pool headers = self.headers + try: + options = options_func() + except PubNubException as e: + return defer.fail(e) url = urlparse.urlunsplit((self.config.scheme(), self.config.origin, - path, urllib.urlencode(query), '')) + options.path, urllib.urlencode(options.params), '')) - print(url) + logger.debug("%s %s" % (HttpMethod.string(options.method), url)) def handler(): # url = self.getUrl(request, encoder_map) diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native/test_here_now.py index 286dfd82..218c1e2e 100644 --- a/tests/integrational/native/test_here_now.py +++ b/tests/integrational/native/test_here_now.py @@ -1,6 +1,5 @@ from pubnub.pubnub import PubNub -import sys import unittest import logging import pubnub diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py index bf9bbcc2..e07e884c 100755 --- a/tests/integrational/twisted/test_here_now.py +++ b/tests/integrational/twisted/test_here_now.py @@ -5,8 +5,12 @@ from twisted.trial import unittest from twisted.web.client import HTTPConnectionPool -from pubnub.pnconfiguration import PNConfiguration +import logging +import pubnub from pubnub.pubnub_twisted import PubNubTwisted +from tests.helper import pnconf + +pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubAsyncAsyncHereNow(unittest.TestCase): @@ -27,12 +31,11 @@ def success(self, res): # self.assertEqual(res.total_occupancy, 1) def error(self, error): - return defer.fail(Exception("Error callback should not be invoked", error)) + return defer.fail(error) def test_success_deferred(self): d = defer.Deferred() - pnconf = PNConfiguration() pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) pubnub.here_now() \ @@ -44,10 +47,19 @@ def test_success_deferred(self): return d + def test_success_sync(self): + pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + res = pubnub.here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .sync() + + print('sync', res) + def xtest_success_async(self): d = defer.Deferred() - pnconf = PNConfiguration() pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) success = self.success From bb851ea4a80d5dabe1c7b15608bd00f1d19fd3cb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:07:30 -0700 Subject: [PATCH 039/468] Fix coverage --- scripts/run-tests | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-tests b/scripts/run-tests index 09f7fb2e..5a1669e9 100755 --- a/scripts/run-tests +++ b/scripts/run-tests @@ -22,6 +22,6 @@ def run(command): return check_call(command, shell=True) if version.startswith('2.7'): - run('py.test --cov=./tests/') + run('py.test --cov=../pubnub') else: - run('py.test --cov=./tests/ --ignore=integrational/twisted/') \ No newline at end of file + run('py.test --cov=../pubnub/ --ignore=integrational/twisted/') From 3d864ed69590486a5081ac87511f544555a5a4bf Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:18:58 -0700 Subject: [PATCH 040/468] Fix assertations for Python 2.6 --- tests/integrational/native/test_publish.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index a9deb60f..ef3ecd8c 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -16,8 +16,8 @@ def test_success(self): .message("hi") \ .sync() - self.assertIsInstance(res, PNPublishResult) - self.assertGreater(res.timetoken, 1) + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 except PubNubException as e: self.fail(e) @@ -30,8 +30,8 @@ def test_success_list(self): .message(["hi", "hi2", "hi3"]) \ .sync() - self.assertIsInstance(res, PNPublishResult) - self.assertGreater(res.timetoken, 1) + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 except PubNubException as e: self.fail(e) @@ -41,8 +41,8 @@ def test_success(self): pubnub = PubNub(pnconf) def success(res): - self.assertIsInstance(res, PNPublishResult) - self.assertGreater(res.timetoken, 1) + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 def error(e): self.fail(e) @@ -58,8 +58,8 @@ def test_success_list(self): pubnub = PubNub(pnconf) def success(res): - self.assertIsInstance(res, PNPublishResult) - self.assertGreater(res.timetoken, 1) + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 def error(e): self.fail(e) From a4b3bda466a673b93809207648a8ea70f146079f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:20:39 -0700 Subject: [PATCH 041/468] Fix stream named argument Python 2.6 compatibility in logger setter --- pubnub/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/__init__.py b/pubnub/__init__.py index 4051d433..eeeaadb9 100755 --- a/pubnub/__init__.py +++ b/pubnub/__init__.py @@ -10,7 +10,7 @@ def set_stream_logger(name='pubnub', level=logging.ERROR, format_string=None, st logger = logging.getLogger(name) logger.setLevel(level) - handler = logging.StreamHandler(stream=stream) + handler = logging.StreamHandler(stream) handler.setLevel(level) formatter = logging.Formatter(format_string) handler.setFormatter(formatter) From 171e21a7e77b296d1485a3fc8d4b035571d3dbf6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:25:57 -0700 Subject: [PATCH 042/468] Fix Python 2.6 missing mock --- requirements26.txt | 1 + scripts/install.sh | 1 + 2 files changed, 2 insertions(+) create mode 100644 requirements26.txt diff --git a/requirements26.txt b/requirements26.txt new file mode 100644 index 00000000..14fe0d3e --- /dev/null +++ b/requirements26.txt @@ -0,0 +1 @@ +mock==2.0.0 diff --git a/scripts/install.sh b/scripts/install.sh index f3dc06f9..fc3e3979 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash pip install -r requirements.txt +if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install twisted pyopenssl; fi \ No newline at end of file From 5afbbfe7ef40a8f1f93e3025623d626e276ccf48 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:26:53 -0700 Subject: [PATCH 043/468] Fix Python 2.6 dict assertions --- tests/functional/test_publish.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index c3319b53..062bd5e1 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -29,7 +29,7 @@ def test_pub_message(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertDictEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -45,7 +45,7 @@ def test_pub_list_message(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertDictEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) From da1619f6fe44f5f17f1280db1450d8f81d9f0b2d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:46:09 -0700 Subject: [PATCH 044/468] Add generation of UUID --- pubnub/pnconfiguration.py | 12 ++++++++++-- pubnub/pubnub_core.py | 2 ++ pubnub/utils.py | 5 +++++ tests/unit/test_utils.py | 6 ++++++ 4 files changed, 23 insertions(+), 2 deletions(-) diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 3a8493ab..529b34f3 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -1,9 +1,11 @@ +from . import utils + class PNConfiguration(object): def __init__(self): + # TODO: add validation self.presence_timeout = 300 - # TODO: generate a random uuid - self.uuid = "" + self.uuid = None self.origin = "pubsub.pubnub.com" self.ssl = False self.non_subscribe_request_timeout = 10 @@ -12,6 +14,12 @@ def __init__(self): self.subscribe_key = None self.publish_key = None + def validate(self): + assert self.uuid is None or isinstance(self.uuid, str) + + if self.uuid is None: + self.uuid = utils.uuid() + def scheme(self): if self.ssl: return "https" diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 12038757..95747147 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -28,6 +28,8 @@ def __init__(self, config): self.config = config self.session = requests.Session() + self.config.validate() + def request_sync(self, options): assert isinstance(options, RequestOptions) diff --git a/pubnub/utils.py b/pubnub/utils.py index 7a18c629..a84982d9 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,4 +1,5 @@ import json +import uuid as u def get_data_for_user(data): @@ -25,3 +26,7 @@ def url_encode(data): from urllib import quote as q return q(data) + + +def uuid(): + return str(u.uuid4()) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 38da23c3..aea674ab 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -17,3 +17,9 @@ def test_list(self): def test_tuple(self): assert utils.write_value_as_string(("ch1", "ch2")) == "[\"ch1\", \"ch2\"]" + + +class TestUUID(unittest.TestCase): + def test_uuid(self): + assert isinstance(utils.uuid(), str) + assert len(utils.uuid()) == 36 From de74846df121a03d0c73714998855d9036264cb9 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:55:04 -0700 Subject: [PATCH 045/468] Add deferred stubs for non-twisted platforms --- pubnub/errors.py | 1 + pubnub/pubnub.py | 5 +++++ pubnub/pubnub_core.py | 8 ++++++++ pubnub/pubnub_tornado.py | 5 +++++ 4 files changed, 19 insertions(+) diff --git a/pubnub/errors.py b/pubnub/errors.py index 555721ad..3b69e3a9 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -14,3 +14,4 @@ PNERR_SUBSCRIBE_KEY_MISSING = "Subscribe key not configured" PNERR_PUBLISH_KEY_MISSING = "Publish key not configured" PNERR_PUBLISH_META_WRONG_TYPE = "Publish meta should be dict" +PNERR_DEFERRED_NOT_IMPLEMENTED = "Deferred endpoint call is not implemented by this platform" diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index f3ca4e5c..c12c7a23 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,6 +1,8 @@ import logging import threading +from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED +from .exceptions import PubNubException from .enums import HttpMethod from .utils import get_data_for_user @@ -33,6 +35,9 @@ def request_async(self, options, success, error): return thread + def request_deferred(self, options_func): + raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) + class AsyncHTTPClient: """A wrapper for threaded calls""" diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 95747147..9cc06f59 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -85,6 +85,14 @@ def request_sync(self, options): return res.json() + @abstractmethod + def request_async(self, options, success, error): + pass + + @abstractmethod + def request_deferred(self, options_func): + pass + def here_now(self): return HereNow(self) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 07fe9096..e04d5e81 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,6 +1,8 @@ import json import time +from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED +from .exceptions import PubNubException from .utils import get_data_for_user from .pubnub_core import PubNubCore @@ -61,6 +63,9 @@ def request_async(self, options, success, error): connect_timeout=5, ) + def request_deferred(self, options_func): + raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) + def _request(self, url, callback=None, error=None, single=False, timeout=15, connect_timeout=5, encoder_map=None): From 83300c04474dc19e81b5541b7282ef9e7321408f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 04:57:09 -0700 Subject: [PATCH 046/468] Remove pip._vendor prefixes --- pubnub/pubnub_core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 9cc06f59..be89b35d 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,9 +1,9 @@ import logging from abc import ABCMeta, abstractmethod -from pip._vendor import requests -from pip._vendor.requests import ConnectionError -from pip._vendor.requests.packages.urllib3.exceptions import HTTPError +import requests +from requests import ConnectionError +from requests.packages.urllib3.exceptions import HTTPError from .enums import HttpMethod from .endpoints.pubsub.publish import Publish From a9d7bc747fb3ab6e0c646eee0a8b885450022306 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 05:17:37 -0700 Subject: [PATCH 047/468] Add POST support to publish --- pubnub/endpoints/pubsub/publish.py | 5 ++++- pubnub/pubnub_core.py | 5 +++-- tests/integrational/native/test_publish.py | 10 ++++++++++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index c18d9e3c..65ba5581 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -64,7 +64,10 @@ def build_path(self): self._channel, 0, stringified_message) def http_method(self): - return HttpMethod.GET + if self._use_post is True: + return HttpMethod.POST + else: + return HttpMethod.GET def validate_params(self): if self._channel is None or len(self._channel) is 0: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index be89b35d..04c3dba7 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -34,11 +34,12 @@ def request_sync(self, options): assert isinstance(options, RequestOptions) url = self.config.scheme_and_host() + options.path - logger.debug("%s %s %s" % (HttpMethod.string(options.method), url, options.params)) + method = HttpMethod.string(options.method) + logger.debug("%s %s %s" % (method, url, options.params)) # connection error try: - res = self.session.get(url, params=options.params) + res = self.session.request(method, url, params=options.params) except ConnectionError as e: raise PubNubException( pn_error=PNERR_CONNECTION_ERROR, diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index ef3ecd8c..a1a66ebd 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -1,3 +1,5 @@ +import vcr + from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub @@ -7,6 +9,8 @@ class TestPubNubSyncPublish(unittest.TestCase): + @vcr.use_cassette('integrational/fixtures/publish/sync_success.yaml', + filter_query_parameters=['uuid']) def test_success(self): pubnub = PubNub(pnconf) @@ -21,6 +25,8 @@ def test_success(self): except PubNubException as e: self.fail(e) + @vcr.use_cassette('integrational/fixtures/publish/sync_success_list.yaml', + filter_query_parameters=['uuid']) def test_success_list(self): pubnub = PubNub(pnconf) @@ -37,6 +43,8 @@ def test_success_list(self): class TestPubNubAsyncPublish(unittest.TestCase): + @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', + filter_query_parameters=['uuid']) def test_success(self): pubnub = PubNub(pnconf) @@ -54,6 +62,8 @@ def error(e): thread.join() + @vcr.use_cassette('integrational/fixtures/publish/async_success_list.yaml', + filter_query_parameters=['uuid']) def test_success_list(self): pubnub = PubNub(pnconf) From 3cba8541fbcff1f3c2f09da5537be3317c8b8654 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 05:18:03 -0700 Subject: [PATCH 048/468] Add publish method fixtures --- .../fixtures/publish/async_success.yaml | 22 +++++++++++++++++++ .../fixtures/publish/async_success_list.yaml | 22 +++++++++++++++++++ .../fixtures/publish/sync_success.yaml | 22 +++++++++++++++++++ .../fixtures/publish/sync_success_list.yaml | 22 +++++++++++++++++++ 4 files changed, 88 insertions(+) create mode 100644 tests/integrational/fixtures/publish/async_success.yaml create mode 100644 tests/integrational/fixtures/publish/async_success_list.yaml create mode 100644 tests/integrational/fixtures/publish/sync_success.yaml create mode 100644 tests/integrational/fixtures/publish/sync_success_list.yaml diff --git a/tests/integrational/fixtures/publish/async_success.yaml b/tests/integrational/fixtures/publish/async_success.yaml new file mode 100644 index 00000000..17216ee9 --- /dev/null +++ b/tests/integrational/fixtures/publish/async_success.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.10.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22 + response: + body: {string: !!python/unicode '[1,"Sent","14633146188252448"]'} + headers: + access-control-allow-methods: [GET] + access-control-allow-origin: ['*'] + cache-control: [no-cache] + connection: [keep-alive] + content-length: ['30'] + content-type: [text/javascript; charset="UTF-8"] + date: ['Sun, 15 May 2016 12:16:58 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/publish/async_success_list.yaml b/tests/integrational/fixtures/publish/async_success_list.yaml new file mode 100644 index 00000000..e03bdf06 --- /dev/null +++ b/tests/integrational/fixtures/publish/async_success_list.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.10.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D + response: + body: {string: !!python/unicode '[1,"Sent","14633146188909996"]'} + headers: + access-control-allow-methods: [GET] + access-control-allow-origin: ['*'] + cache-control: [no-cache] + connection: [keep-alive] + content-length: ['30'] + content-type: [text/javascript; charset="UTF-8"] + date: ['Sun, 15 May 2016 12:16:58 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/publish/sync_success.yaml b/tests/integrational/fixtures/publish/sync_success.yaml new file mode 100644 index 00000000..64792c8c --- /dev/null +++ b/tests/integrational/fixtures/publish/sync_success.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.10.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2FPubNub-Python + response: + body: {string: !!python/unicode '[1,"Sent","14633146186921075"]'} + headers: + access-control-allow-methods: [GET] + access-control-allow-origin: ['*'] + cache-control: [no-cache] + connection: [keep-alive] + content-length: ['30'] + content-type: [text/javascript; charset="UTF-8"] + date: ['Sun, 15 May 2016 12:16:58 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/publish/sync_success_list.yaml b/tests/integrational/fixtures/publish/sync_success_list.yaml new file mode 100644 index 00000000..52dc75b3 --- /dev/null +++ b/tests/integrational/fixtures/publish/sync_success_list.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python-requests/2.10.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2FPubNub-Python + response: + body: {string: !!python/unicode '[1,"Sent","14633146187587978"]'} + headers: + access-control-allow-methods: [GET] + access-control-allow-origin: ['*'] + cache-control: [no-cache] + connection: [keep-alive] + content-length: ['30'] + content-type: [text/javascript; charset="UTF-8"] + date: ['Sun, 15 May 2016 12:16:58 GMT'] + status: {code: 200, message: OK} +version: 1 From 055e924c178f99097640dbd0c508b496ea8e5ab0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 15 May 2016 05:19:55 -0700 Subject: [PATCH 049/468] Add vcrpy to requirements.txt --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index a6c87370..0f259f03 100755 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ pytest pytest-cov codecov tornado +vcrpy From eb0aa1908551277e1b6c6ad0f7a29c64fcd80032 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 16 May 2016 02:57:09 -0700 Subject: [PATCH 050/468] Fix sdk name generation --- pubnub/pubnub_core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 04c3dba7..11f87df6 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -102,7 +102,7 @@ def publish(self): @property def sdk_name(self): - return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_NAME) + return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) @abstractmethod def sdk_platform(self): pass From 4f792d5b6458e829d0cbb3a01062774f023f3e63 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 16 May 2016 05:29:52 -0700 Subject: [PATCH 051/468] Extract request logic into pn_request helper for native requests --- pubnub/pubnub.py | 27 ++++------ pubnub/pubnub_core.py | 111 ++++++++++++++++++++++-------------------- 2 files changed, 67 insertions(+), 71 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index c12c7a23..a12b904d 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -4,9 +4,8 @@ from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED from .exceptions import PubNubException from .enums import HttpMethod -from .utils import get_data_for_user -from .pubnub_core import PubNubCore, RequestOptions +from .pubnub_core import PubNubCore, RequestOptions, pn_request logger = logging.getLogger("pubnub") @@ -23,27 +22,26 @@ def sdk_platform(self): def request_async(self, options, success, error): assert isinstance(options, RequestOptions) - # TODO: query param not used url = self.config.scheme_and_host() + options.path logger.debug("%s %s %s" % (HttpMethod.string(options.method), url, options.params)) - client = AsyncHTTPClient(self, url=url, callback=success, error=error) + client = AsyncHTTPClient(self, options, success, error) thread = threading.Thread(target=client.run) thread.start() return thread - def request_deferred(self, options_func): raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) + class AsyncHTTPClient: """A wrapper for threaded calls""" - def __init__(self, pubnub, url,callback=None, error=None, id=None): + def __init__(self, pubnub, options, callback=None, error=None, id=None): # TODO: introduce timeouts - self.url = url + self.options = options self.id = id self.success = callback self.error = error @@ -54,13 +52,8 @@ def cancel(self): self.error = None def run(self): - def _invoke(func, data): - if func is not None: - func(get_data_for_user(data)) - - resp = self.pubnub.session.get(self.url) - if resp.status_code == 200: - _invoke(self.success, resp.json()) - else: - _invoke(self.error, resp) - + try: + res = pn_request(self.pubnub.session, self.pubnub.config.scheme_and_host(), self.options) + self.success(res) + except PubNubException as e: + self.error(e) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 11f87df6..440a5350 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -31,60 +31,7 @@ def __init__(self, config): self.config.validate() def request_sync(self, options): - assert isinstance(options, RequestOptions) - - url = self.config.scheme_and_host() + options.path - method = HttpMethod.string(options.method) - logger.debug("%s %s %s" % (method, url, options.params)) - - # connection error - try: - res = self.session.request(method, url, params=options.params) - except ConnectionError as e: - raise PubNubException( - pn_error=PNERR_CONNECTION_ERROR, - errormsg=str(e) - ) - except HTTPError as e: - raise PubNubException( - pn_error=PNERR_HTTP_ERROR, - errormsg=str(e) - ) - except requests.exceptions.Timeout as e: - raise PubNubException( - pn_error=PNERR_CLIENT_TIMEOUT, - errormsg=str(e) - ) - except requests.exceptions.TooManyRedirects as e: - raise PubNubException( - pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, - errormsg=str(e) - ) - except Exception as e: - raise PubNubException( - pn_error=PNERR_UNKNOWN_ERROR, - errormsg=str(e) - ) - - # http error - if res.status_code != requests.codes.ok: - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - - raise PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - ) - - return res.json() + return pn_request(self.session, self.config.scheme_and_host(), options) @abstractmethod def request_async(self, options, success, error): @@ -110,3 +57,59 @@ def sdk_platform(self): pass @property def uuid(self): return self.config.uuid + + +def pn_request(session, scheme_and_host, options): + assert isinstance(options, RequestOptions) + url = scheme_and_host + options.path + method = HttpMethod.string(options.method) + logger.debug("%s %s %s" % (method, url, options.params)) + + # connection error + try: + res = session.request(method, url, params=options.params) + except ConnectionError as e: + raise PubNubException( + pn_error=PNERR_CONNECTION_ERROR, + errormsg=str(e) + ) + except HTTPError as e: + raise PubNubException( + pn_error=PNERR_HTTP_ERROR, + errormsg=str(e) + ) + except requests.exceptions.Timeout as e: + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + except requests.exceptions.TooManyRedirects as e: + raise PubNubException( + pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, + errormsg=str(e) + ) + except Exception as e: + raise PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg=str(e) + ) + + # http error + if res.status_code != requests.codes.ok: + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + raise PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ) + + return res.json() From c7538547639b71a992c3e58187cb758f551e5dbb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 16 May 2016 07:23:34 -0700 Subject: [PATCH 052/468] Remove unused code --- pubnub/pubnub.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index a12b904d..dbccf096 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -3,9 +3,8 @@ from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED from .exceptions import PubNubException -from .enums import HttpMethod -from .pubnub_core import PubNubCore, RequestOptions, pn_request +from .pubnub_core import PubNubCore, pn_request logger = logging.getLogger("pubnub") @@ -20,11 +19,6 @@ def sdk_platform(self): return "" def request_async(self, options, success, error): - assert isinstance(options, RequestOptions) - - url = self.config.scheme_and_host() + options.path - logger.debug("%s %s %s" % (HttpMethod.string(options.method), url, options.params)) - client = AsyncHTTPClient(self, options, success, error) thread = threading.Thread(target=client.run) From a1ea3d6a900d978fc5518b26c805e7725ded517f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 16 May 2016 07:24:24 -0700 Subject: [PATCH 053/468] Add publish example --- examples/publish.py | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 examples/publish.py diff --git a/examples/publish.py b/examples/publish.py new file mode 100755 index 00000000..d27700d6 --- /dev/null +++ b/examples/publish.py @@ -0,0 +1,27 @@ +# PubNub HereNow usage example +import logging +import sys + +sys.path.append("../") + +import pubnub +from examples import pnconf +from pubnub.pubnub import PubNub + +pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) + +pnconf.publish_key="blah" +pubnub = PubNub(pnconf) + +def success(msg): + print("success", msg) + +def error(err): + print("error", err) + +thread = pubnub.publish() \ + .channel("blah") \ + .message("hey") \ + .async(success, error) + +thread.join() From 8257c88e32899e64887833b3f62ab752fd3b1907 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 16 May 2016 09:19:48 -0700 Subject: [PATCH 054/468] Add native timeouts --- pubnub/pubnub.py | 4 +++- pubnub/pubnub_core.py | 12 ++++++++--- tests/integrational/native/test_publish.py | 23 ++++++++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index dbccf096..26af7579 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -47,7 +47,9 @@ def cancel(self): def run(self): try: - res = pn_request(self.pubnub.session, self.pubnub.config.scheme_and_host(), self.options) + res = pn_request(self.pubnub.session, self.pubnub.config.scheme_and_host(), self.options, + self.pubnub.config.connect_timeout, + self.pubnub.config.non_subscribe_request_timeout) self.success(res) except PubNubException as e: self.error(e) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 440a5350..32dac9b7 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -31,7 +31,8 @@ def __init__(self, config): self.config.validate() def request_sync(self, options): - return pn_request(self.session, self.config.scheme_and_host(), options) + return pn_request(self.session, self.config.scheme_and_host(), options, + self.config.connect_timeout, self.config.non_subscribe_request_timeout) @abstractmethod def request_async(self, options, success, error): @@ -59,7 +60,7 @@ def uuid(self): return self.config.uuid -def pn_request(session, scheme_and_host, options): +def pn_request(session, scheme_and_host, options, connect_timeout, read_timeout): assert isinstance(options, RequestOptions) url = scheme_and_host + options.path method = HttpMethod.string(options.method) @@ -67,7 +68,12 @@ def pn_request(session, scheme_and_host, options): # connection error try: - res = session.request(method, url, params=options.params) + res = session.request( + method=method, + url=url, + params=options.params, + timeout=(connect_timeout, read_timeout) + ) except ConnectionError as e: raise PubNubException( pn_error=PNERR_CONNECTION_ERROR, diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index a1a66ebd..6de923f1 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -2,11 +2,17 @@ from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub from tests.helper import pnconf import unittest +# TODO: server error handling test +# TODO: arguments error handling test +# TODO: post method test +# TODO: meta argument method test + class TestPubNubSyncPublish(unittest.TestCase): @vcr.use_cassette('integrational/fixtures/publish/sync_success.yaml', @@ -41,6 +47,23 @@ def test_success_list(self): except PubNubException as e: self.fail(e) + def test_server_error(self): + # TODO: should throw error + config = PNConfiguration() + config.publish_key = "demo" + config.subscribe_key = "demos" + pubnub = PubNub(config) + + try: + pubnub.publish() \ + .channel("ch1") \ + .message("hey") \ + .sync() + + self.fail(Exception("Should throw exception")) + except PubNubException as e: + assert e is not None + class TestPubNubAsyncPublish(unittest.TestCase): @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', From 5ca4da526d4407323418757edb5b466684f48ca4 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 17 May 2016 02:05:44 -0700 Subject: [PATCH 055/468] Add publish POST option --- pubnub/endpoints/endpoint.py | 6 +- pubnub/endpoints/pubsub/publish.py | 22 ++++++-- pubnub/pubnub_core.py | 22 +++++--- pubnub/structures.py | 3 +- tests/integrational/native/test_publish.py | 64 +++++++++++++++++++--- 5 files changed, 94 insertions(+), 23 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 67a6cd39..e833e4d8 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -19,6 +19,9 @@ def build_path(self): def build_params(self): pass + def build_data(self): + return None + @abstractmethod def http_method(self): pass @@ -32,7 +35,8 @@ def create_response(self, endpoint): pass def options(self): - return RequestOptions(self.build_path(), self.build_params(), self.http_method()) + return RequestOptions(self.build_path(), self.build_params(), + self.http_method(), self.build_data()) def sync(self): self.validate_params() diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 65ba5581..d7e065bf 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -9,7 +9,8 @@ class Publish(Endpoint): # /publish//////[?argument(s)] - PUBLISH_PATH = "/publish/%s/%s/0/%s/%s/%s" + PUBLISH_GET_PATH = "/publish/%s/%s/0/%s/%s/%s" + PUBLISH_POST_PATH = "/publish/%s/%s/0/%s/%s" def __init__(self, pubnub): Endpoint.__init__(self, pubnub) @@ -39,6 +40,10 @@ def meta(self, meta): self._meta = meta return self + def build_data(self): + # TODO: encrypt if cipher key is set + return utils.write_value_as_string(self._message) + def build_params(self): params = self.default_params() @@ -56,12 +61,17 @@ def build_params(self): return params def build_path(self): - # TODO: encrypt if cipher key is set - stringified_message = utils.url_encode(utils.write_value_as_string(self._message)) + if self._use_post: + return Publish.PUBLISH_POST_PATH % (self.pubnub.config.publish_key, + self.pubnub.config.subscribe_key, + self._channel, 0) + else: + # TODO: encrypt if cipher key is set + stringified_message = utils.url_encode(utils.write_value_as_string(self._message)) - # TODO: add option to publish with POST - return Publish.PUBLISH_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, - self._channel, 0, stringified_message) + return Publish.PUBLISH_GET_PATH % (self.pubnub.config.publish_key, + self.pubnub.config.subscribe_key, + self._channel, 0, stringified_message) def http_method(self): if self._use_post is True: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 32dac9b7..81dd2c64 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -64,16 +64,23 @@ def pn_request(session, scheme_and_host, options, connect_timeout, read_timeout) assert isinstance(options, RequestOptions) url = scheme_and_host + options.path method = HttpMethod.string(options.method) - logger.debug("%s %s %s" % (method, url, options.params)) + + args = { + "method": method, + "url": url, + 'params': options.params, + 'timeout': (connect_timeout, read_timeout) + } + + if options.method == HttpMethod.POST: + args['data'] = options.data + logger.debug("%s %s %s %s" % (method, url, options.params, options.data)) + else: + logger.debug("%s %s %s" % (method, url, options.params)) # connection error try: - res = session.request( - method=method, - url=url, - params=options.params, - timeout=(connect_timeout, read_timeout) - ) + res = session.request(**args) except ConnectionError as e: raise PubNubException( pn_error=PNERR_CONNECTION_ERROR, @@ -111,7 +118,6 @@ def pn_request(session, scheme_and_host, options, connect_timeout, read_timeout) err = PNERR_SERVER_ERROR else: err = PNERR_CLIENT_ERROR - raise PubNubException( pn_error=err, errormsg=text, diff --git a/pubnub/structures.py b/pubnub/structures.py index 858b0469..811dd942 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -3,7 +3,7 @@ class RequestOptions(object): - def __init__(self, path, params, method): + def __init__(self, path, params, method, data=None): assert len(path) > 0 assert len(params) > 0 assert isinstance(method, int) @@ -12,3 +12,4 @@ def __init__(self, path, params, method): self.path = path self.params = params self.method = method + self.data = data diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 6de923f1..ae4c9505 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -1,12 +1,19 @@ +import logging +import threading + +import time import vcr +import unittest +import pubnub from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub from tests.helper import pnconf -import unittest +pubnub.set_stream_logger('pubnub', logging.DEBUG) + # TODO: server error handling test # TODO: arguments error handling test @@ -48,21 +55,28 @@ def test_success_list(self): self.fail(e) def test_server_error(self): - # TODO: should throw error config = PNConfiguration() - config.publish_key = "demo" - config.subscribe_key = "demos" - pubnub = PubNub(config) + config.publish_key = "demo2" + config.subscribe_key = "demo" try: - pubnub.publish() \ + PubNub(config).publish() \ .channel("ch1") \ .message("hey") \ .sync() self.fail(Exception("Should throw exception")) except PubNubException as e: - assert e is not None + assert "Invalid Key" in str(e) + + def test_post(self): + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message("hey") \ + .use_post(True) \ + .sync() + + assert res.timetoken > 0 class TestPubNubAsyncPublish(unittest.TestCase): @@ -103,3 +117,39 @@ def error(e): .async(success, error) thread.join() + + def test_server_error(self): + config = PNConfiguration() + config.publish_key = "demo2" + config.subscribe_key = "demo" + await = threading.Event() + + def success(): + await.set() + + def error(e): + await.set() + + thread = PubNub(config).publish() \ + .channel("ch1") \ + .message("hey") \ + .async(success, error) + + res = await.wait() + # thread.join() + + def test_post(self): + def success(res): + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + + def error(e): + self.fail(e) + + thread = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message("hey") \ + .use_post(True) \ + .async(success, error) + + thread.join() From 486ce15197105b7f4023956668119ea072400957 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 17 May 2016 02:07:33 -0700 Subject: [PATCH 056/468] Rename test runner --- .travis.yml | 2 +- scripts/{run-tests => run-tests.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/{run-tests => run-tests.py} (100%) diff --git a/.travis.yml b/.travis.yml index 8bdb8d84..f6b55681 100755 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,4 @@ python: - "pypy" sudo: false install: bash scripts/install.sh -script: python scripts/run-tests +script: python scripts/run-tests.py diff --git a/scripts/run-tests b/scripts/run-tests.py similarity index 100% rename from scripts/run-tests rename to scripts/run-tests.py From f10b45ae517a544524c86bb88c348e611a69cf88 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 17 May 2016 03:16:54 -0700 Subject: [PATCH 057/468] Ignore native async tests --- tests/integrational/native/test_publish.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index ae4c9505..894af51a 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -79,7 +79,7 @@ def test_post(self): assert res.timetoken > 0 -class TestPubNubAsyncPublish(unittest.TestCase): +class xTestPubNubAsyncPublish(): @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', filter_query_parameters=['uuid']) def test_success(self): From 5e7ea8fdc4108a846e2fc727189bd1a4bec4f356 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 17 May 2016 03:17:54 -0700 Subject: [PATCH 058/468] Configure headers --- pubnub/pubnub.py | 4 ++-- pubnub/pubnub_core.py | 12 ++++++++++-- pubnub/pubnub_tornado.py | 3 --- pubnub/pubnub_twisted.py | 2 -- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 26af7579..b23b409d 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -47,8 +47,8 @@ def cancel(self): def run(self): try: - res = pn_request(self.pubnub.session, self.pubnub.config.scheme_and_host(), self.options, - self.pubnub.config.connect_timeout, + res = pn_request(self.pubnub.session, self.pubnub.config.scheme_and_host(), self.pubnub.headers, + self.options, self.pubnub.config.connect_timeout, self.pubnub.config.non_subscribe_request_timeout) self.success(res) except PubNubException as e: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 81dd2c64..b845ff6f 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -31,7 +31,7 @@ def __init__(self, config): self.config.validate() def request_sync(self, options): - return pn_request(self.session, self.config.scheme_and_host(), options, + return pn_request(self.session, self.config.scheme_and_host(), self.headers, options, self.config.connect_timeout, self.config.non_subscribe_request_timeout) @abstractmethod @@ -55,18 +55,26 @@ def sdk_name(self): @abstractmethod def sdk_platform(self): pass + @property + def headers(self): + # TODO: add Accept-Encoding + return { + 'User-Agent': [self.sdk_name], + } + @property def uuid(self): return self.config.uuid -def pn_request(session, scheme_and_host, options, connect_timeout, read_timeout): +def pn_request(session, scheme_and_host, headers, options, connect_timeout, read_timeout): assert isinstance(options, RequestOptions) url = scheme_and_host + options.path method = HttpMethod.string(options.method) args = { "method": method, + 'headers': headers, "url": url, 'params': options.params, 'timeout': (connect_timeout, read_timeout) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index e04d5e81..616cc999 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -44,12 +44,9 @@ def __init__(self, config): super(PubNubTornado, self).__init__(config) self._ioloop = default_ioloop - # self.headers = {'User-Agent': 'Python-Tornado', 'Accept-Encoding': self.accept_encoding, 'V': self.version} # TODO: add accept encoding - self.headers = {'User-Agent': 'Python-Tornado', 'V': self.SDK_VERSION} self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) self.id = None - self.pnsdk = 'PubNub-Python-' + 'Tornado' + '/' + self.SDK_VERSION def request_async(self, options, success, error): # TODO: query param is not used diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index d93dea88..46783c33 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -57,8 +57,6 @@ def __init__(self, config, pool=None, reactor=None): else: self.pnconn_pool = pool - self.headers = {'User-Agent': ['Python-Twisted'], 'V': [self.SDK_VERSION]} - def start(self): self.reactor.run() From d63babc2c4f86be61f57a3a27c9c705f527c5541 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 17 May 2016 03:18:03 -0700 Subject: [PATCH 059/468] Update fixtures --- .../fixtures/publish/async_success.yaml | 22 ------------------- .../fixtures/publish/async_success_list.yaml | 22 ------------------- .../fixtures/publish/sync_success.yaml | 8 +++---- .../fixtures/publish/sync_success_list.yaml | 8 +++---- 4 files changed, 8 insertions(+), 52 deletions(-) delete mode 100644 tests/integrational/fixtures/publish/async_success.yaml delete mode 100644 tests/integrational/fixtures/publish/async_success_list.yaml diff --git a/tests/integrational/fixtures/publish/async_success.yaml b/tests/integrational/fixtures/publish/async_success.yaml deleted file mode 100644 index 17216ee9..00000000 --- a/tests/integrational/fixtures/publish/async_success.yaml +++ /dev/null @@ -1,22 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - User-Agent: [python-requests/2.10.0] - method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22 - response: - body: {string: !!python/unicode '[1,"Sent","14633146188252448"]'} - headers: - access-control-allow-methods: [GET] - access-control-allow-origin: ['*'] - cache-control: [no-cache] - connection: [keep-alive] - content-length: ['30'] - content-type: [text/javascript; charset="UTF-8"] - date: ['Sun, 15 May 2016 12:16:58 GMT'] - status: {code: 200, message: OK} -version: 1 diff --git a/tests/integrational/fixtures/publish/async_success_list.yaml b/tests/integrational/fixtures/publish/async_success_list.yaml deleted file mode 100644 index e03bdf06..00000000 --- a/tests/integrational/fixtures/publish/async_success_list.yaml +++ /dev/null @@ -1,22 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - User-Agent: [python-requests/2.10.0] - method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D - response: - body: {string: !!python/unicode '[1,"Sent","14633146188909996"]'} - headers: - access-control-allow-methods: [GET] - access-control-allow-origin: ['*'] - cache-control: [no-cache] - connection: [keep-alive] - content-length: ['30'] - content-type: [text/javascript; charset="UTF-8"] - date: ['Sun, 15 May 2016 12:16:58 GMT'] - status: {code: 200, message: OK} -version: 1 diff --git a/tests/integrational/fixtures/publish/sync_success.yaml b/tests/integrational/fixtures/publish/sync_success.yaml index 64792c8c..f3eb7098 100644 --- a/tests/integrational/fixtures/publish/sync_success.yaml +++ b/tests/integrational/fixtures/publish/sync_success.yaml @@ -5,11 +5,11 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python-requests/2.10.0] + User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2FPubNub-Python + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: !!python/unicode '[1,"Sent","14633146186921075"]'} + body: {string: !!python/unicode '[1,"Sent","14634801632369535"]'} headers: access-control-allow-methods: [GET] access-control-allow-origin: ['*'] @@ -17,6 +17,6 @@ interactions: connection: [keep-alive] content-length: ['30'] content-type: [text/javascript; charset="UTF-8"] - date: ['Sun, 15 May 2016 12:16:58 GMT'] + date: ['Tue, 17 May 2016 10:16:03 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/publish/sync_success_list.yaml b/tests/integrational/fixtures/publish/sync_success_list.yaml index 52dc75b3..6f4d24ba 100644 --- a/tests/integrational/fixtures/publish/sync_success_list.yaml +++ b/tests/integrational/fixtures/publish/sync_success_list.yaml @@ -5,11 +5,11 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [python-requests/2.10.0] + User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2FPubNub-Python + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: !!python/unicode '[1,"Sent","14633146187587978"]'} + body: {string: !!python/unicode '[1,"Sent","14634801633052203"]'} headers: access-control-allow-methods: [GET] access-control-allow-origin: ['*'] @@ -17,6 +17,6 @@ interactions: connection: [keep-alive] content-length: ['30'] content-type: [text/javascript; charset="UTF-8"] - date: ['Sun, 15 May 2016 12:16:58 GMT'] + date: ['Tue, 17 May 2016 10:16:03 GMT'] status: {code: 200, message: OK} version: 1 From 6a15e357aff8bde7ac4d9e781c8c55dc189c2761 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 17 May 2016 03:38:20 -0700 Subject: [PATCH 060/468] Rewrite headers as static property --- pubnub/pubnub_core.py | 10 +++------- pubnub/pubnub_tornado.py | 3 +++ pubnub/pubnub_twisted.py | 4 ++++ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index b845ff6f..52695d1c 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -29,6 +29,9 @@ def __init__(self, config): self.session = requests.Session() self.config.validate() + self.headers = { + 'User-Agent': self.sdk_name, + } def request_sync(self, options): return pn_request(self.session, self.config.scheme_and_host(), self.headers, options, @@ -55,13 +58,6 @@ def sdk_name(self): @abstractmethod def sdk_platform(self): pass - @property - def headers(self): - # TODO: add Accept-Encoding - return { - 'User-Agent': [self.sdk_name], - } - @property def uuid(self): return self.config.uuid diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 616cc999..8ab7e2ec 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -47,6 +47,9 @@ def __init__(self, config): # TODO: add accept encoding self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) self.id = None + self.headers = { + 'User-Agent': [self.sdk_name], + } def request_async(self, options, success, error): # TODO: query param is not used diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 46783c33..c124cb6a 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -57,6 +57,10 @@ def __init__(self, config, pool=None, reactor=None): else: self.pnconn_pool = pool + self.headers = { + 'User-Agent': [self.sdk_name], + } + def start(self): self.reactor.run() From 5376cbf44762ccde089dccf532272f0deff0e549 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 18 May 2016 08:33:48 -0700 Subject: [PATCH 061/468] Add twisted POST method implementation --- pubnub/endpoints/endpoint.py | 4 +- pubnub/endpoints/pubsub/publish.py | 8 +- pubnub/errors.py | 1 + pubnub/models/consumer/pubsub.py | 3 +- pubnub/pubnub_core.py | 10 +- pubnub/pubnub_twisted.py | 85 +++++++++++----- pubnub/structures.py | 9 +- pubnub/utils.py | 4 +- tests/integrational/twisted/test_publish.py | 107 ++++++++++++++++++++ 9 files changed, 192 insertions(+), 39 deletions(-) create mode 100644 tests/integrational/twisted/test_publish.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index e833e4d8..13116811 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -70,7 +70,9 @@ def handler(): self.validate_params() return self.options() - return self.pubnub.request_deferred(handler).addCallback(self.create_response) + return self.pubnub\ + .request_deferred(handler)\ + .addCallback(self.create_response) def default_params(self): return { diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index d7e065bf..79e9e06b 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -42,7 +42,10 @@ def meta(self, meta): def build_data(self): # TODO: encrypt if cipher key is set - return utils.write_value_as_string(self._message) + if self._use_post is True: + return utils.write_value_as_string(self._message) + else: + return None def build_params(self): params = self.default_params() @@ -96,9 +99,8 @@ def create_response(self, envelope): :param envelope: an already serialized json response :return: """ - timetoken = int(envelope[2]) - res = PNPublishResult(timetoken) + res = PNPublishResult(envelope, timetoken) return res diff --git a/pubnub/errors.py b/pubnub/errors.py index 3b69e3a9..be2b79d9 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -15,3 +15,4 @@ PNERR_PUBLISH_KEY_MISSING = "Publish key not configured" PNERR_PUBLISH_META_WRONG_TYPE = "Publish meta should be dict" PNERR_DEFERRED_NOT_IMPLEMENTED = "Deferred endpoint call is not implemented by this platform" +PNERR_JSON_DECODING_FAILED = "JSON decoding failed" diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index fbe0e8e0..d58e19b9 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -1,3 +1,4 @@ class PNPublishResult(object): - def __init__(self, timetoken): + def __init__(self, original_response, timetoken): + self.original_response = original_response self.timetoken = timetoken diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 52695d1c..bfee06be 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -5,7 +5,6 @@ from requests import ConnectionError from requests.packages.urllib3.exceptions import HTTPError -from .enums import HttpMethod from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow from .structures import RequestOptions @@ -66,21 +65,20 @@ def uuid(self): def pn_request(session, scheme_and_host, headers, options, connect_timeout, read_timeout): assert isinstance(options, RequestOptions) url = scheme_and_host + options.path - method = HttpMethod.string(options.method) args = { - "method": method, + "method": options.method_string, 'headers': headers, "url": url, 'params': options.params, 'timeout': (connect_timeout, read_timeout) } - if options.method == HttpMethod.POST: + if options.is_post(): args['data'] = options.data - logger.debug("%s %s %s %s" % (method, url, options.params, options.data)) + logger.debug("%s %s %s %s" % (options.method_string, url, options.params, options.data)) else: - logger.debug("%s %s %s" % (method, url, options.params)) + logger.debug("%s %s %s" % (options.method_string, url, options.params)) # connection error try: diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index c124cb6a..ec7a5753 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -3,6 +3,8 @@ import urllib import urlparse +from StringIO import StringIO + from twisted.internet import reactor as _reactor from twisted.internet.defer import Deferred from twisted.internet import defer @@ -12,10 +14,10 @@ from twisted.web.client import HTTPConnectionPool from twisted.web.http_headers import Headers from twisted.internet.ssl import ClientContextFactory +from twisted.web.client import FileBodyProducer -from .enums import HttpMethod +from .errors import PNERR_JSON_DECODING_FAILED, PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR from .exceptions import PubNubException -from .utils import get_data_for_user from .pubnub_core import PubNubCore @@ -27,12 +29,14 @@ def getContext(self, hostname, port): return ClientContextFactory.getContext(self) +# class PubNubResponse(Protocol, TimeoutMixin): class PubNubResponse(Protocol): - def __init__(self, finished): + def __init__(self, finished, code): self.finished = finished + self.code = code - def dataReceived(self, bytes): - self.finished.callback(bytes) + def dataReceived(self, body): + self.finished.callback(TwistedResponse(body, self.code)) class PubNubTwisted(PubNubCore): @@ -93,7 +97,7 @@ def request_async(self, options, success, error): def handler(): def _invoke(func, data): if func is not None: - func(get_data_for_user(data)) + func(data) def s(data): _invoke(success, data) @@ -119,7 +123,7 @@ def request_deferred(self, options_func): url = urlparse.urlunsplit((self.config.scheme(), self.config.origin, options.path, urllib.urlencode(options.params), '')) - logger.debug("%s %s" % (HttpMethod.string(options.method), url)) + logger.debug("%s %s %s" % (options.method_string, url, options.data)) def handler(): # url = self.getUrl(request, encoder_map) @@ -130,46 +134,77 @@ def handler(): pool=pnconn_pool )), [('gzip', GzipDecoder)]) + if options.data is not None: + print(options.data) + body = FileBodyProducer(StringIO(options.data)) + else: + body = None + try: request = agent.request( - 'GET', url, Headers(headers), None) + options.method_string, + url, + Headers(headers), + body) except TypeError: request = agent.request( - 'GET', url.encode(), Headers(headers), None) + options.method_string, + url.encode(), + Headers(headers), + body) def received(response): finished = Deferred() - response.deliverBody(PubNubResponse(finished)) + + response.deliverBody(PubNubResponse(finished, response.code)) return finished - def complete(data): + def success(response): + response_body = response.body + code = response.code d = Deferred() try: - data = json.loads(data) + data = json.loads(response_body) except ValueError: try: - data = json.loads(data.decode("utf-8")) + data = json.loads(response_body.decode("utf-8")) except ValueError: - d.errback('json decode error') + d.errback(PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error' + )) return - if 'error' in data and 'status' in data and 'status' != 200: - d.errback(data) + if code != 200: + if code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + if data is None: + data = "N/A" + + d.errback(PubNubException( + pn_error=err, + errormsg=data, + status_code=code + )) else: d.callback(data) return d - def errback(msg): - print("TODO: handle errback") - # TODO: handle this case - d = Deferred() - d.errback(msg) - return d - - request.addCallbacks(received, errback) - request.addCallbacks(complete, errback) + request.addCallback(received) + # request.addErrback(error) + request.addCallback(success) + # request.addErrback(error) return request return handler() + + +class TwistedResponse(object): + def __init__(self, body, code): + self.body = body + self.code = code diff --git a/pubnub/structures.py b/pubnub/structures.py index 811dd942..21e1d050 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -11,5 +11,12 @@ def __init__(self, path, params, method, data=None): self.path = path self.params = params - self.method = method + self._method = method self.data = data + + @property + def method_string(self): + return HttpMethod.string(self._method) + + def is_post(self): + return self._method is HttpMethod.POST diff --git a/pubnub/utils.py b/pubnub/utils.py index a84982d9..83f7faa1 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -14,9 +14,9 @@ def get_data_for_user(data): def write_value_as_string(data): if isinstance(data, str): - return "\"%s\"" % data + return ("\"%s\"" % data).replace("+", "%20") else: - return json.dumps(data) + return json.dumps(data).replace("+", "%20") def url_encode(data): diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py new file mode 100644 index 00000000..cd736c4e --- /dev/null +++ b/tests/integrational/twisted/test_publish.py @@ -0,0 +1,107 @@ +from twisted.internet import defer +from twisted.internet.task import deferLater +from twisted.internet.tcp import Client +from twisted.internet import reactor +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +import logging +import pubnub +from pubnub.pubnub_twisted import PubNubTwisted +from tests.helper import pnconf + +pubnub.set_stream_logger('pubnub', logging.DEBUG) +defer.setDebugging(True) + + +class TestPubNubPublish(unittest.TestCase): + def setUp(self): + self.pool = HTTPConnectionPool(reactor, False) + + def tearDown(self): + def _check_fds(_): + fds = set(reactor.getReaders() + reactor.getReaders()) + if not [fd for fd in fds if isinstance(fd, Client)]: + return + return deferLater(reactor, 0, _check_fds, None) + + return self.pool.closeCachedConnections().addBoth(_check_fds) + + def success(self, res, third=None): + print(res.timetoken) + assert res.timetoken > 0 + + def error(self, error): + return defer.fail(error) + + def test_publish_deferred(self): + d = defer.Deferred() + + pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + pubnub.publish() \ + .channel("my_channel") \ + .message("deferred hello using GET") \ + .deferred() \ + .addCallback(self.success) \ + .addCallbacks(d.callback, d.errback) + + return d + + def test_publish_sync(self): + pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + res = pubnub.publish() \ + .channel("my_channel") \ + .message("sync hello using GET") \ + .sync() + + assert res.timetoken > 0 + + def test_publish_list_deferred(self): + d = defer.Deferred() + + pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + pubnub.publish() \ + .channel("my_channel") \ + .message(["deferred", "hello", "using", "GET"]) \ + .deferred() \ + .addCallback(self.success) \ + .addCallbacks(d.callback, d.errback) + + return d + + def test_publish_post_deferred(self): + d = defer.Deferred() + + # delayedCall = reactor.callLater(3, d.cancel) + # + # def gotResult(result): + # if delayedCall.active(): + # delayedCall.cancel() + # return result + + PubNubTwisted(pnconf, reactor=reactor, pool=self.pool).publish() \ + .channel("my_channel") \ + .message("deferred string hello using POST") \ + .use_post(True) \ + .deferred() \ + .addCallback(self.success, self.error) \ + .addCallbacks(d.callback, d.errback) + # .addBoth(gotResult) + + return d + + def test_publish_post_list_deferred(self): + d = defer.Deferred() + + PubNubTwisted(pnconf, reactor=reactor, pool=self.pool).publish() \ + .channel("my_channel") \ + .message(["deferred", "list", "using", "POST"]) \ + .use_post(True) \ + .deferred() \ + .addCallback(self.success, self.error) \ + .addCallbacks(d.callback, d.errback) + + return d From d6f25344d82655ce53d5349ba95fceae9a74282c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 19 May 2016 04:58:27 -0700 Subject: [PATCH 062/468] Add Tornado example app --- examples/tornado/__init__.py | 0 examples/tornado/chat/__init__.py | 0 examples/tornado/chat/app.py | 41 +++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) create mode 100644 examples/tornado/__init__.py create mode 100644 examples/tornado/chat/__init__.py create mode 100644 examples/tornado/chat/app.py diff --git a/examples/tornado/__init__.py b/examples/tornado/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/tornado/chat/__init__.py b/examples/tornado/chat/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/tornado/chat/app.py b/examples/tornado/chat/app.py new file mode 100644 index 00000000..214c3826 --- /dev/null +++ b/examples/tornado/chat/app.py @@ -0,0 +1,41 @@ +import tornado.ioloop +import tornado.web +import sys +import os + +d = os.path.dirname +PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) +sys.path.append(PUBNUB_ROOT) + +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub + + +class AsyncHandler(tornado.web.RequestHandler): + @tornado.web.asynchronous + def get(self): + pnconf = PNConfiguration() + pnconf.subscribe_key = "demo" + pnconf.publish_key = "demo" + pubnub = PubNub(pnconf) + + pubnub.publish().channel("my_channel").message("hello").async(self.success, self.error) + + def success(self, response): + self.write(str(response.envelope)) + self.finish() + + def error(self, error): + self.write(str(error)) + self.finish() + + +def make_app(): + return tornado.web.Application([ + (r"/", AsyncHandler), + ]) + +if __name__ == "__main__": + app = make_app() + app.listen(8888) + tornado.ioloop.IOLoop.current().start() From a834b8e06cf035041f8e1c788c7bb077479417af Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 19 May 2016 12:09:34 -0700 Subject: [PATCH 063/468] Add a base yield support to examples --- examples/tornado/chat/app.py | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/examples/tornado/chat/app.py b/examples/tornado/chat/app.py index 214c3826..a53b18a1 100644 --- a/examples/tornado/chat/app.py +++ b/examples/tornado/chat/app.py @@ -1,14 +1,17 @@ import tornado.ioloop import tornado.web +import tornado.gen import sys import os +from tornado.stack_context import ExceptionStackContext + d = os.path.dirname PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) sys.path.append(PUBNUB_ROOT) from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub import PubNub +from pubnub.pubnub_tornado import PubNubTornado class AsyncHandler(tornado.web.RequestHandler): @@ -17,7 +20,7 @@ def get(self): pnconf = PNConfiguration() pnconf.subscribe_key = "demo" pnconf.publish_key = "demo" - pubnub = PubNub(pnconf) + pubnub = PubNubTornado(pnconf) pubnub.publish().channel("my_channel").message("hello").async(self.success, self.error) @@ -30,9 +33,27 @@ def error(self, error): self.finish() +# TODO: implement yielding pubnub result +class YieldHandler(tornado.web.RequestHandler): + @tornado.gen.coroutine + def get(self): + pnconf = PNConfiguration() + pnconf.subscribe_key = "demo" + pnconf.publish_key = "demo" + pubnub = PubNubTornado(pnconf) + + def handle_err(type, second, third): + self.write(str(type)) + + with ExceptionStackContext(handle_err): + response = yield pubnub.publish().channel("my_channel").message("hello").deferred() + self.write(str(response)) + + def make_app(): return tornado.web.Application([ - (r"/", AsyncHandler), + (r"/async", AsyncHandler), + (r"/yield", YieldHandler), ]) if __name__ == "__main__": From 20c7cd3838747d0ba621eb2898df386c2d9112ed Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 04:04:36 -0700 Subject: [PATCH 064/468] Add response code support to PubNubException string --- pubnub/exceptions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pubnub/exceptions.py b/pubnub/exceptions.py index e514fdf1..0fe115b3 100755 --- a/pubnub/exceptions.py +++ b/pubnub/exceptions.py @@ -4,10 +4,11 @@ def __init__(self, errormsg="", status_code=0, pn_error=None): self._status_code = status_code self._pn_error = pn_error - if len(str(errormsg)) > 0: + if len(str(errormsg)) > 0 and int(status_code) > 0: + msg = str(pn_error) + " (" + str(status_code) + "): " + str(errormsg) + elif len(str(errormsg)) > 0: msg = str(pn_error) + ": " + str(errormsg) else: msg = str(pn_error) super(PubNubException, self).__init__(msg) - From 580b1d93932101b8235a573ee27d0c06921c9453 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 04:05:19 -0700 Subject: [PATCH 065/468] Add envelope field to Publish response type --- pubnub/models/consumer/pubsub.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index d58e19b9..88b3e4f0 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -1,4 +1,11 @@ class PNPublishResult(object): - def __init__(self, original_response, timetoken): - self.original_response = original_response + def __init__(self, envelope, timetoken): + """ + Representation of server response + + :param envelope: original response from server + :param timetoken: of publish operation + """ + self.original_response = envelope + self.envelope = envelope self.timetoken = timetoken From 317e455ea06961384dbc4fcdd3be872eb9fa027f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 04:06:24 -0700 Subject: [PATCH 066/468] Add todo --- pubnub/structures.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pubnub/structures.py b/pubnub/structures.py index 21e1d050..3ff7562a 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -12,6 +12,7 @@ def __init__(self, path, params, method, data=None): self.path = path self.params = params self._method = method + # TODO: rename to 'body' self.data = data @property From 75907014e91d13dda4f4f43363f67109d8103b94 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 04:07:19 -0700 Subject: [PATCH 067/468] Reconfigure Tornado platform, add POST method support, add Publish tests --- pubnub/pubnub_tornado.py | 118 +++++++++----------- tests/integrational/tornado/test_publish.py | 106 ++++++++++++++++++ 2 files changed, 161 insertions(+), 63 deletions(-) create mode 100644 tests/integrational/tornado/test_publish.py diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 8ab7e2ec..939f069f 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,14 +1,15 @@ import json import time +import urllib +import urlparse -from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED from .exceptions import PubNubException -from .utils import get_data_for_user +from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED from .pubnub_core import PubNubCore import tornado.httpclient import tornado.ioloop -from tornado.stack_context import ExceptionStackContext +from tornado.concurrent import Future default_ioloop = tornado.ioloop.IOLoop.instance() @@ -44,85 +45,76 @@ def __init__(self, config): super(PubNubTornado, self).__init__(config) self._ioloop = default_ioloop - # TODO: add accept encoding self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) self.id = None + # TODO: add accept encoding should be configurable self.headers = { - 'User-Agent': [self.sdk_name], + 'User-Agent': self.sdk_name, + 'Accept-Encoding': 'utf-8' } def request_async(self, options, success, error): - # TODO: query param is not used - url = self.config.scheme_and_host() + options.path - self._request( - url=url, - callback=success, - error=error, - # TODO: set correct timeout - timeout=15, - connect_timeout=5, - ) - - def request_deferred(self, options_func): - raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) - - def _request(self, url, callback=None, error=None, - single=False, timeout=15, connect_timeout=5, encoder_map=None): - def _invoke(func, data): if func is not None: - func(get_data_for_user(data)) + func(data) + url = urlparse.urlunsplit((self.config.scheme(), self.config.origin, + options.path, urllib.urlencode(options.params), '')) # TODO: encode url # url = self.getUrl(url, encoder_map) request = tornado.httpclient.HTTPRequest( - url, 'GET', - self.headers, - connect_timeout=connect_timeout, - request_timeout=timeout) - - if single is True: - id = time.time() - self.id = id - - def responseCallback(response): - if single is True: - if not id == self.id: - return None - - body = response._get_body() - - if body is None: - # TODO: handle exception - return + url=url, + method=options.method_string, + headers=self.headers, + body=options.data if options.data is not None else None, + connect_timeout=self.config.connect_timeout, + request_timeout=self.config.non_subscribe_request_timeout) - def handle_exc(*args): - return True + def response_callback(response): + body = response.body - if response.error is not None: - with ExceptionStackContext(handle_exc): - if response.code in [403, 401]: - response.rethrow() - else: - _invoke(error, response.reason) - return - - try: - data = json.loads(body) - except TypeError: + if body is not None and len(body) > 0: try: - data = json.loads(body.decode("utf-8")) - except ValueError: - _invoke(error, 'json decode error') - return + data = json.loads(body) + except TypeError: + try: + data = json.loads(body.decode("utf-8")) + except ValueError: + _invoke(error, PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error' + )) + return + else: + data = "N/A" - if 'error' in data and 'status' in data and 'status' != 200: - _invoke(error, data) + if response.error is not None: + if response.code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + _invoke(error, PubNubException( + errormsg=data, + pn_error=err, + status_code=response.code + )) else: - _invoke(callback, data) + _invoke(success, data) self.http.fetch( request=request, - callback=responseCallback + callback=response_callback + ) + + # TODO: add Tornado Feature support + def request_deferred(self, options_func): + options = options_func() + future = Future() + self.request_async( + options, + lambda res: future.set_result(res), + lambda err: future.set_exception(err) ) + return future diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py new file mode 100644 index 00000000..eecb2a45 --- /dev/null +++ b/tests/integrational/tornado/test_publish.py @@ -0,0 +1,106 @@ +from tornado.testing import AsyncTestCase + +from pubnub.models.consumer.pubsub import PNPublishResult + +from pubnub.pubnub_tornado import PubNubTornado +from tests.helper import pnconf + + +class TestPubNubAsyncPublish(AsyncTestCase): + def test_publish_string_via_get(self): + pubnub = PubNubTornado(pnconf) + pubnub.set_ioloop(self.io_loop) + + def success(res): + pubnub.stop() + self.stop() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 0 + assert len(res.original_response) > 0 + + def error(err): + pubnub.stop() + self.stop() + self.fail("Error while success is expected: " + str(err)) + + pubnub.publish() \ + .channel("my_channel") \ + .message("async hello string using GET") \ + .async(success, error) + + pubnub.start() + self.wait() + + def test_publish_list_via_get(self): + pubnub = PubNubTornado(pnconf) + pubnub.set_ioloop(self.io_loop) + + def success(res): + pubnub.stop() + self.stop() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 0 + assert len(res.original_response) > 0 + + def error(err): + pubnub.stop() + self.stop() + self.fail("Error while success is expected: " + str(err)) + + pubnub.publish() \ + .channel("my_channel") \ + .message(["async", "hello", "list", "using GET"]) \ + .async(success, error) + + pubnub.start() + self.wait() + + def test_publish_string_via_post(self): + pubnub = PubNubTornado(pnconf) + pubnub.set_ioloop(self.io_loop) + + def success(res): + pubnub.stop() + self.stop() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 0 + assert len(res.original_response) > 0 + + def error(err): + pubnub.stop() + self.stop() + self.fail("Error while success is expected: " + str(err)) + + pubnub.publish() \ + .channel("my_channel") \ + .message("async hello string using POST") \ + .use_post(True) \ + .async(success, error) + + pubnub.start() + self.wait() + + def test_publish_list_via_post(self): + pubnub = PubNubTornado(pnconf) + pubnub.set_ioloop(self.io_loop) + + def success(res): + pubnub.stop() + self.stop() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 0 + assert len(res.original_response) > 0 + + def error(err): + pubnub.stop() + self.stop() + self.fail("Error while success is expected: " + str(err)) + + pubnub.publish() \ + .channel("my_channel") \ + .message(["async", "hello", "list", "using POST"]) \ + .use_post(True) \ + .async(success, error) + + pubnub.start() + self.wait() From 26a892950a9546ace1c2b8506144abd633e415c1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 06:02:21 -0700 Subject: [PATCH 068/468] Add utils.build_url() --- pubnub/utils.py | 15 +++++++++++++++ tests/unit/test_utils.py | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/pubnub/utils.py b/pubnub/utils.py index 83f7faa1..24c557bc 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,6 +1,17 @@ import json +import urllib import uuid as u +try: + from urllib.parse import urlunsplit as pn_urlunsplit +except ImportError: + from urlparse import urlunsplit as pn_urlunsplit + +try: + from urllib.parse import urlencode as pn_urlencode +except ImportError: + from urlparse import urlencode as pn_urlencode + def get_data_for_user(data): try: @@ -30,3 +41,7 @@ def url_encode(data): def uuid(): return str(u.uuid4()) + + +def build_url(scheme, origin, path, params): + return pn_urlunsplit((scheme, origin, path, pn_urlencode(params), '')) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index aea674ab..c4f7569e 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,6 +1,16 @@ import unittest from pubnub import utils +from pubnub.utils import build_url +try: + from urllib.parse import urlparse +except ImportError: + from urlparse import urlparse + +try: + from urllib.parse import parse_qs +except ImportError: + from urlparse import parse_qs class TestWriteValueAsString(unittest.TestCase): @@ -23,3 +33,20 @@ class TestUUID(unittest.TestCase): def test_uuid(self): assert isinstance(utils.uuid(), str) assert len(utils.uuid()) == 36 + + +class TestBuildUrl(unittest.TestCase): + def test_build_url(self): + def match(expected_str, actual_str): + expected = urlparse(expected_str) + actual = urlparse(actual_str) + assert expected.scheme == actual.scheme + assert expected.netloc == actual.netloc + assert expected.path == actual.path + self.assertEqual(parse_qs(expected.query), parse_qs(actual.query)) + + match("http://ex.com/news?a=2&b=qwer", + build_url("http", "ex.com", "/news", {"a": 2, "b": "qwer"})) + match("https://ex.com/?a=2&b=qwer", + build_url("https", "ex.com", "/", {"a": 2, "b": "qwer"})) + From da43e6282d58e8c8f950aeac244bb45687310b12 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 06:05:00 -0700 Subject: [PATCH 069/468] Fix urllib imports --- pubnub/utils.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pubnub/utils.py b/pubnub/utils.py index 24c557bc..6c15cdd1 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,5 +1,4 @@ import json -import urllib import uuid as u try: @@ -10,7 +9,7 @@ try: from urllib.parse import urlencode as pn_urlencode except ImportError: - from urlparse import urlencode as pn_urlencode + from urllib import urlencode as pn_urlencode def get_data_for_user(data): From d9d0bfb34b06228b3b9c1e98d2b3aba6dcfa0774 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 06:05:40 -0700 Subject: [PATCH 070/468] Migrate Twisted and Tornado to utils.build_url() usage --- pubnub/pubnub_tornado.py | 7 +++---- pubnub/pubnub_twisted.py | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 939f069f..22c44394 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,8 +1,7 @@ import json import time -import urllib -import urlparse +from . import utils from .exceptions import PubNubException from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED from .pubnub_core import PubNubCore @@ -58,8 +57,8 @@ def _invoke(func, data): if func is not None: func(data) - url = urlparse.urlunsplit((self.config.scheme(), self.config.origin, - options.path, urllib.urlencode(options.params), '')) + url = utils.build_url(self.config.scheme(), self.config.origin, + options.path, options.params) # TODO: encode url # url = self.getUrl(url, encoder_map) diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index ec7a5753..95f92291 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -1,7 +1,5 @@ import json import logging -import urllib -import urlparse from StringIO import StringIO @@ -16,6 +14,7 @@ from twisted.internet.ssl import ClientContextFactory from twisted.web.client import FileBodyProducer +from . import utils from .errors import PNERR_JSON_DECODING_FAILED, PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR from .exceptions import PubNubException from .pubnub_core import PubNubCore @@ -120,8 +119,8 @@ def request_deferred(self, options_func): except PubNubException as e: return defer.fail(e) - url = urlparse.urlunsplit((self.config.scheme(), self.config.origin, - options.path, urllib.urlencode(options.params), '')) + url = utils.build_url(self.config.scheme(), self.config.origin, + options.path, options.params) logger.debug("%s %s %s" % (options.method_string, url, options.data)) From 694944ba51e336e9d7993da59401303713ac8670 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 20 May 2016 06:30:58 -0700 Subject: [PATCH 071/468] Temporarily disable fixtures --- .../fixtures/publish/sync_success.yaml | 22 ------------------- .../fixtures/publish/sync_success_list.yaml | 22 ------------------- 2 files changed, 44 deletions(-) delete mode 100644 tests/integrational/fixtures/publish/sync_success.yaml delete mode 100644 tests/integrational/fixtures/publish/sync_success_list.yaml diff --git a/tests/integrational/fixtures/publish/sync_success.yaml b/tests/integrational/fixtures/publish/sync_success.yaml deleted file mode 100644 index f3eb7098..00000000 --- a/tests/integrational/fixtures/publish/sync_success.yaml +++ /dev/null @@ -1,22 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0 - response: - body: {string: !!python/unicode '[1,"Sent","14634801632369535"]'} - headers: - access-control-allow-methods: [GET] - access-control-allow-origin: ['*'] - cache-control: [no-cache] - connection: [keep-alive] - content-length: ['30'] - content-type: [text/javascript; charset="UTF-8"] - date: ['Tue, 17 May 2016 10:16:03 GMT'] - status: {code: 200, message: OK} -version: 1 diff --git a/tests/integrational/fixtures/publish/sync_success_list.yaml b/tests/integrational/fixtures/publish/sync_success_list.yaml deleted file mode 100644 index 6f4d24ba..00000000 --- a/tests/integrational/fixtures/publish/sync_success_list.yaml +++ /dev/null @@ -1,22 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.0 - response: - body: {string: !!python/unicode '[1,"Sent","14634801633052203"]'} - headers: - access-control-allow-methods: [GET] - access-control-allow-origin: ['*'] - cache-control: [no-cache] - connection: [keep-alive] - content-length: ['30'] - content-type: [text/javascript; charset="UTF-8"] - date: ['Tue, 17 May 2016 10:16:03 GMT'] - status: {code: 200, message: OK} -version: 1 From 58b6f65499ff71e180d355523d56922f87bb6a2a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 02:08:04 -0700 Subject: [PATCH 072/468] Add publihs POST tests --- tests/integrational/native/test_publish.py | 126 +++++++++++++++++---- 1 file changed, 107 insertions(+), 19 deletions(-) diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 894af51a..1fc7716d 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -1,7 +1,6 @@ import logging import threading -import time import vcr import unittest @@ -15,22 +14,40 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -# TODO: server error handling test -# TODO: arguments error handling test -# TODO: post method test -# TODO: meta argument method test +class TestPubNubSyncPublish(unittest.TestCase): + # @vcr.use_cassette('integrational/fixtures/publish/publish_string_get.yaml', + # filter_query_parameters=['uuid']) + def test_publish_string_get(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message("hi") \ + .sync() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) -class TestPubNubSyncPublish(unittest.TestCase): - @vcr.use_cassette('integrational/fixtures/publish/sync_success.yaml', - filter_query_parameters=['uuid']) - def test_success(self): - pubnub = PubNub(pnconf) + # @vcr.use_cassette('integrational/fixtures/publish/publish_list_get.yaml', + # filter_query_parameters=['uuid']) + def test_publish_list_get(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(["hi", "hi2", "hi3"]) \ + .sync() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + def test_publish_object_get(self): try: - res = pubnub.publish() \ + res = PubNub(pnconf).publish() \ .channel("ch1") \ - .message("hi") \ + .message({"name": "Alex", "online": True}) \ .sync() assert isinstance(res, PNPublishResult) @@ -38,13 +55,49 @@ def test_success(self): except PubNubException as e: self.fail(e) - @vcr.use_cassette('integrational/fixtures/publish/sync_success_list.yaml', - filter_query_parameters=['uuid']) - def test_success_list(self): - pubnub = PubNub(pnconf) + def test_publish_bool_get(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(True) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + def test_publish_int_get(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(5) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + # @vcr.use_cassette('integrational/fixtures/publish/publish_string_post.yaml', + # filter_query_parameters=['uuid']) + def test_publish_string_post(self): try: - res = pubnub.publish() \ + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message("hi") \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + # @vcr.use_cassette('integrational/fixtures/publish/publish_list_post.yaml', + # filter_query_parameters=['uuid']) + def test_publish_list_post(self): + try: + res = PubNub(pnconf).publish() \ .channel("ch1") \ .message(["hi", "hi2", "hi3"]) \ .sync() @@ -54,9 +107,45 @@ def test_success_list(self): except PubNubException as e: self.fail(e) + def test_publish_object_post(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message({"name": "Alex", "online": True}) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + def test_publish_bool_post(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(True) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + def test_publish_int_post(self): + try: + res = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(5) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + def test_server_error(self): config = PNConfiguration() - config.publish_key = "demo2" + config.publish_key = "fake" config.subscribe_key = "demo" try: @@ -78,7 +167,6 @@ def test_post(self): assert res.timetoken > 0 - class xTestPubNubAsyncPublish(): @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', filter_query_parameters=['uuid']) From 91713923cfd6dcad55f20e386b80ad3580fc1baa Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 02:33:57 -0700 Subject: [PATCH 073/468] Add pycrypto to requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 0f259f03..61189bd0 100755 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,4 @@ pytest-cov codecov tornado vcrpy +pycrypto From 07096a474f4731f4d751108082f1e750623aaf9d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 06:41:57 -0700 Subject: [PATCH 074/468] Add PubnubCrypto --- pubnub/crypto.py | 60 ++++++++++++++++++++++ pubnub/endpoints/pubsub/publish.py | 6 ++- pubnub/pnconfiguration.py | 1 + tests/functional/test_publish.py | 33 ++++++++++-- tests/helper.py | 2 +- tests/integrational/native/test_publish.py | 1 + 6 files changed, 97 insertions(+), 6 deletions(-) create mode 100644 pubnub/crypto.py diff --git a/pubnub/crypto.py b/pubnub/crypto.py new file mode 100644 index 00000000..e935781b --- /dev/null +++ b/pubnub/crypto.py @@ -0,0 +1,60 @@ +import hashlib + +from Crypto.Cipher import AES +from base64 import encodestring, decodestring +from base64 import urlsafe_b64encode + +import sys + +try: + from hashlib import sha256 + digestmod = sha256 +except ImportError: + import Crypto.Hash.SHA256 as digestmod + sha256 = digestmod.new + +if sys.version_info > (3, 0): + v = 3 +else: + v = 2 + +Initial16bytes = '0123456789012345' + + +def pad(msg, block_size=16): + padding = block_size - (len(msg) % block_size) + + if v == 3: + return msg + (chr(padding) * padding).encode('utf-8') + else: + return msg + chr(padding) * padding + + +def depad(msg): + return msg[0:-ord(msg[-1])] + + +def get_secret(key): + if v == 3: + return hashlib.sha256(key.encode("utf-8")).hexdigest() + else: + return hashlib.sha256(key).hexdigest() + + +def encrypt(key, msg): + secret = get_secret(key) + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + if v == 3: + return encodestring(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8') + else: + return encodestring(cipher.encrypt(pad(msg))) + + +def decrypt(key, msg): + secret = get_secret(key) + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + + if v == 3: + return (cipher.decrypt(decodestring(msg.encode('utf-8')))).decode('utf-8') + else: + return depad(cipher.decrypt(decodestring(msg))) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 79e9e06b..7f2595cc 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -1,4 +1,5 @@ from pubnub import utils +from pubnub import crypto as pn_crypto from pubnub.endpoints.endpoint import Endpoint from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING, \ PNERR_PUBLISH_META_WRONG_TYPE @@ -69,8 +70,11 @@ def build_path(self): self.pubnub.config.subscribe_key, self._channel, 0) else: - # TODO: encrypt if cipher key is set stringified_message = utils.url_encode(utils.write_value_as_string(self._message)) + cipher = self.pubnub.config.cipher_key + + if cipher is not None: + stringified_message = pn_crypto.encrypt(cipher, stringified_message) return Publish.PUBLISH_GET_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 529b34f3..79d400ec 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -13,6 +13,7 @@ def __init__(self): self.connect_timeout = 5 self.subscribe_key = None self.publish_key = None + self.cipher_key = None def validate(self): assert self.uuid is None or isinstance(self.uuid, str) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 062bd5e1..2722d034 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -1,3 +1,4 @@ +import copy import unittest try: @@ -7,7 +8,7 @@ from pubnub.endpoints.pubsub.publish import Publish from pubnub.pubnub import PubNub -from tests.helper import pnconf, sdk_name, encode +from tests.helper import pnconf, sdk_name, url_encode class TestPublish(unittest.TestCase): @@ -22,7 +23,7 @@ def setUp(self): def test_pub_message(self): message = "hi" - encoded_message = encode(message) + encoded_message = url_encode(message) self.pub.channel("ch1").message(message) @@ -38,7 +39,7 @@ def test_pub_list_message(self): self.pubnub.uuid = "UUID_PublishUnitTest" message = ["hi", "hi2", "hi3"] - encoded_message = encode(message) + encoded_message = url_encode(message) self.pub.channel("ch1").message(message) @@ -50,5 +51,29 @@ def test_pub_list_message(self): 'uuid': self.pubnub.uuid }) + def test_pub_encrypted_list_message(self): + conf = copy.copy(pnconf) + conf.cipher_key = "testCipher" + + pubnub = MagicMock( + spec=PubNub, + config=conf, + sdk_name=sdk_name, + uuid="UUID_PublishUnitTest" + ) + pub = Publish(pubnub) + + message = ["hi", "hi2", "hi3"] + encoded_message = "gN2gKwKS2FUwTbXVBn3mYzNxBTw02OogJzzOYE0bNWhIWRFygiZSFqk9TEBjxpLH\n" + + pub.channel("ch1").message(message) + + print(pub.build_path()) + self.assertEquals(pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertEqual(pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': pubnub.uuid + }) -# TODO: auth key diff --git a/tests/helper.py b/tests/helper.py index 5a2e9a27..3fca20b5 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -9,5 +9,5 @@ sdk_name = "Python-UnitTest" -def encode(data): +def url_encode(data): return utils.url_encode(utils.write_value_as_string(data)) diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 1fc7716d..47d689ce 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -167,6 +167,7 @@ def test_post(self): assert res.timetoken > 0 + class xTestPubNubAsyncPublish(): @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', filter_query_parameters=['uuid']) From 0b3dad6c60b134b0710b4b912164bea219854f60 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 08:46:08 -0700 Subject: [PATCH 075/468] Fix publish GET encoding --- pubnub/crypto.py | 4 ++-- pubnub/endpoints/pubsub/publish.py | 8 +++++-- tests/helper.py | 5 +++++ tests/integrational/native/test_publish.py | 26 +++++++++++++++++++++- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/pubnub/crypto.py b/pubnub/crypto.py index e935781b..5054cd16 100644 --- a/pubnub/crypto.py +++ b/pubnub/crypto.py @@ -45,9 +45,9 @@ def encrypt(key, msg): secret = get_secret(key) cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) if v == 3: - return encodestring(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8') + return encodestring(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") else: - return encodestring(cipher.encrypt(pad(msg))) + return encodestring(cipher.encrypt(pad(msg))).replace("\n", "") def decrypt(key, msg): diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 7f2595cc..857f7367 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -70,11 +70,15 @@ def build_path(self): self.pubnub.config.subscribe_key, self._channel, 0) else: - stringified_message = utils.url_encode(utils.write_value_as_string(self._message)) + cipher = self.pubnub.config.cipher_key + stringified_message = utils.write_value_as_string(self._message) + if cipher is not None: - stringified_message = pn_crypto.encrypt(cipher, stringified_message) + stringified_message = '"' + pn_crypto.encrypt(cipher, stringified_message) + '"' + + stringified_message = utils.url_encode(stringified_message) return Publish.PUBLISH_GET_PATH % (self.pubnub.config.publish_key, self.pubnub.config.subscribe_key, diff --git a/tests/helper.py b/tests/helper.py index 3fca20b5..1b6d9423 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -6,6 +6,11 @@ pnconf.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconf_enc = PNConfiguration() +pnconf_enc.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" +pnconf_enc.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconf_enc.cipher_key = "testKey" + sdk_name = "Python-UnitTest" diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 47d689ce..07ee9e29 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -9,7 +9,7 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub -from tests.helper import pnconf +from tests.helper import pnconf, pnconf_enc pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -79,6 +79,30 @@ def test_publish_int_get(self): except PubNubException as e: self.fail(e) + def test_publish_encrypted_string_get(self): + try: + res = PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string") \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + def test_publish_encrypted_list_get(self): + try: + res = PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message(["encrypted", "list"]) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + # @vcr.use_cassette('integrational/fixtures/publish/publish_string_post.yaml', # filter_query_parameters=['uuid']) def test_publish_string_post(self): From 251d08fe37ff004b4b2151b07ed1326aa38a8376 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 09:11:07 -0700 Subject: [PATCH 076/468] Add publsih POST encryption --- pubnub/endpoints/pubsub/publish.py | 9 ++++---- tests/integrational/native/test_publish.py | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 857f7367..8b071774 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -42,9 +42,12 @@ def meta(self, meta): return self def build_data(self): - # TODO: encrypt if cipher key is set if self._use_post is True: - return utils.write_value_as_string(self._message) + cipher = self.pubnub.config.cipher_key + if cipher is not None: + return '"' + pn_crypto.encrypt(cipher, utils.write_value_as_string(self._message)) + '"' + else: + return utils.write_value_as_string(self._message) else: return None @@ -70,9 +73,7 @@ def build_path(self): self.pubnub.config.subscribe_key, self._channel, 0) else: - cipher = self.pubnub.config.cipher_key - stringified_message = utils.write_value_as_string(self._message) if cipher is not None: diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 07ee9e29..78922f35 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -167,6 +167,32 @@ def test_publish_int_post(self): except PubNubException as e: self.fail(e) + def test_publish_encrypted_string_post(self): + try: + res = PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string POST") \ + .use_post(True) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + + def test_publish_encrypted_list_post(self): + try: + res = PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message(["encrypted", "list", "POST"]) \ + .use_post(True) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + def test_server_error(self): config = PNConfiguration() config.publish_key = "fake" From 79392dedb1c4fda2b3c15a052b9d9c1e16bb6891 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 09:27:40 -0700 Subject: [PATCH 077/468] Fix hardcoding string matcher --- tests/functional/test_publish.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 2722d034..9570b09f 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -64,7 +64,7 @@ def test_pub_encrypted_list_message(self): pub = Publish(pubnub) message = ["hi", "hi2", "hi3"] - encoded_message = "gN2gKwKS2FUwTbXVBn3mYzNxBTw02OogJzzOYE0bNWhIWRFygiZSFqk9TEBjxpLH\n" + encoded_message = "%22FQyKoIWWm7oN27zKyoU0bpjpgx49JxD04EI/0a8rg/o%3D%22" pub.channel("ch1").message(message) From 6aadcfbb691acd943c5206fceec22c711d5c8b6d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 10:00:34 -0700 Subject: [PATCH 078/468] Add sync publish error tests --- pubnub/errors.py | 1 + pubnub/utils.py | 16 ++++++-- tests/integrational/native/test_publish.py | 43 ++++++++++++++++++---- 3 files changed, 48 insertions(+), 12 deletions(-) diff --git a/pubnub/errors.py b/pubnub/errors.py index be2b79d9..f3e921eb 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -16,3 +16,4 @@ PNERR_PUBLISH_META_WRONG_TYPE = "Publish meta should be dict" PNERR_DEFERRED_NOT_IMPLEMENTED = "Deferred endpoint call is not implemented by this platform" PNERR_JSON_DECODING_FAILED = "JSON decoding failed" +PNERR_JSON_NOT_SERIALIZABLE = "Trying to publish not JSON serializable object" diff --git a/pubnub/utils.py b/pubnub/utils.py index 6c15cdd1..d5d8e700 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,6 +1,9 @@ import json import uuid as u +from .errors import PNERR_JSON_NOT_SERIALIZABLE +from .exceptions import PubNubException + try: from urllib.parse import urlunsplit as pn_urlunsplit except ImportError: @@ -23,10 +26,15 @@ def get_data_for_user(data): def write_value_as_string(data): - if isinstance(data, str): - return ("\"%s\"" % data).replace("+", "%20") - else: - return json.dumps(data).replace("+", "%20") + try: + if isinstance(data, str): + return ("\"%s\"" % data).replace("+", "%20") + else: + return json.dumps(data).replace("+", "%20") + except TypeError as e: + raise PubNubException( + pn_error=PNERR_JSON_NOT_SERIALIZABLE + ) def url_encode(data): diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 78922f35..9e1d8fbe 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -193,7 +193,7 @@ def test_publish_encrypted_list_post(self): except PubNubException as e: self.fail(e) - def test_server_error(self): + def test_invalid_key(self): config = PNConfiguration() config.publish_key = "fake" config.subscribe_key = "demo" @@ -208,14 +208,41 @@ def test_server_error(self): except PubNubException as e: assert "Invalid Key" in str(e) - def test_post(self): - res = PubNub(pnconf).publish() \ - .channel("ch1") \ - .message("hey") \ - .use_post(True) \ - .sync() + def test_missing_message_error(self): + try: + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(None) \ + .sync() + + self.fail(Exception("Should throw exception")) + except PubNubException as e: + assert "Message missing" in str(e) - assert res.timetoken > 0 + def test_missing_channel_error(self): + try: + PubNub(pnconf).publish() \ + .channel("") \ + .message("hey") \ + .sync() + + self.fail(Exception("Should throw exception")) + except PubNubException as e: + assert "Channel missing" in str(e) + + def test_non_serializable_error(self): + def func(): + pass + + try: + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(func) \ + .sync() + + self.fail(Exception("Should throw exception")) + except PubNubException as e: + assert "not JSON serializable" in str(e) class xTestPubNubAsyncPublish(): From 415158179f8af309ff1e98f09db711483fca16c2 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 10:13:05 -0700 Subject: [PATCH 079/468] Add publish meta test --- pubnub/endpoints/pubsub/publish.py | 2 -- tests/functional/test_publish.py | 18 ++++++++++++++++++ tests/integrational/native/test_publish.py | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 8b071774..20ee9d53 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -55,8 +55,6 @@ def build_params(self): params = self.default_params() if self._meta is not None: - if not isinstance(self._meta, dict): - raise PubNubException(pn_error=PNERR_PUBLISH_META_WRONG_TYPE) params['meta'] = utils.url_encode(utils.write_value_as_string(self._meta)) if self._should_store is not None: diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 9570b09f..804205ce 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -51,6 +51,24 @@ def test_pub_list_message(self): 'uuid': self.pubnub.uuid }) + def test_pub_with_meta(self): + self.pubnub.uuid = "UUID_PublishUnitTest" + + message = ["hi", "hi2", "hi3"] + encoded_message = url_encode(message) + meta = ['m1', 'm2'] + + self.pub.channel("ch1").message(message).meta(meta) + + self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertEqual(self.pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'meta': url_encode(meta) + }) + def test_pub_encrypted_list_message(self): conf = copy.copy(pnconf) conf.cipher_key = "testCipher" diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 9e1d8fbe..3334fa44 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -244,6 +244,21 @@ def func(): except PubNubException as e: assert "not JSON serializable" in str(e) + def test_publish_with_meta(self): + meta = ["m2", "m1"] + + try: + res = PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string") \ + .meta(meta) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + class xTestPubNubAsyncPublish(): @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', From db862040a7ea2702b98809e3f97714ee72bbe13a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 12:55:29 -0700 Subject: [PATCH 080/468] Add meta option to publish requests; Change params encoding behaviour --- pubnub/endpoints/pubsub/publish.py | 2 +- pubnub/pubnub_core.py | 4 +-- pubnub/structures.py | 17 ++++++++++ tests/functional/test_publish.py | 37 +++++++++++++++++++++- tests/integrational/native/test_publish.py | 17 ++++++++-- 5 files changed, 71 insertions(+), 6 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 20ee9d53..f40026aa 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -55,7 +55,7 @@ def build_params(self): params = self.default_params() if self._meta is not None: - params['meta'] = utils.url_encode(utils.write_value_as_string(self._meta)) + params['meta'] = utils.write_value_as_string(self._meta) if self._should_store is not None: if self._should_store: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index bfee06be..65cab36a 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -29,7 +29,7 @@ def __init__(self, config): self.config.validate() self.headers = { - 'User-Agent': self.sdk_name, + 'User-Agent': self.sdk_name } def request_sync(self, options): @@ -70,7 +70,7 @@ def pn_request(session, scheme_and_host, headers, options, connect_timeout, read "method": options.method_string, 'headers': headers, "url": url, - 'params': options.params, + 'params': options.query_string, 'timeout': (connect_timeout, read_timeout) } diff --git a/pubnub/structures.py b/pubnub/structures.py index 3ff7562a..00ac90d4 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -1,4 +1,5 @@ # TODO: choose a better name for this module +from . import utils from .enums import HttpMethod @@ -21,3 +22,19 @@ def method_string(self): def is_post(self): return self._method is HttpMethod.POST + + @property + def query_string(self, do_not_encode=None): + # TODO: add option to sort params alphabetically(for PAM requests) + if do_not_encode is None: + do_not_encode = [] + + s = [] + e = utils.url_encode + + for k, v in self.params.items(): + if k in do_not_encode: + continue + s.append(e(k) + "=" + e(v)) + + return str('&'.join(s)) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 804205ce..e6aec398 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -1,4 +1,5 @@ import copy +import json import unittest try: @@ -66,7 +67,41 @@ def test_pub_with_meta(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'meta': url_encode(meta) + 'meta': json.dumps(meta) + }) + + def test_pub_store(self): + self.pubnub.uuid = "UUID_PublishUnitTest" + + message = ["hi", "hi2", "hi3"] + encoded_message = url_encode(message) + + self.pub.channel("ch1").message(message).should_store(True) + + self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertEqual(self.pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'store': '1' + }) + + def test_pub_do_not_store(self): + self.pubnub.uuid = "UUID_PublishUnitTest" + + message = ["hi", "hi2", "hi3"] + encoded_message = url_encode(message) + + self.pub.channel("ch1").message(message).should_store(False) + + self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertEqual(self.pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'store': '0' }) def test_pub_encrypted_list_message(self): diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 3334fa44..29557124 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -245,12 +245,12 @@ def func(): assert "not JSON serializable" in str(e) def test_publish_with_meta(self): - meta = ["m2", "m1"] + meta = {'a': 2, 'b': 'qwer'} try: res = PubNub(pnconf_enc).publish() \ .channel("ch1") \ - .message("encrypted string") \ + .message("hey") \ .meta(meta) \ .sync() @@ -259,6 +259,19 @@ def test_publish_with_meta(self): except PubNubException as e: self.fail(e) + def test_publish_do_not_store(self): + try: + res = PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("hey") \ + .should_store(False) \ + .sync() + + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 + except PubNubException as e: + self.fail(e) + class xTestPubNubAsyncPublish(): @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', From dffe6aee5980671b90cea54b2224d4e0b291a651 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 13:08:00 -0700 Subject: [PATCH 081/468] Add publish auth_key support --- pubnub/endpoints/pubsub/publish.py | 3 +++ pubnub/pnconfiguration.py | 1 + tests/functional/test_publish.py | 26 +++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index f40026aa..a48d22f8 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -63,6 +63,9 @@ def build_params(self): else: params["store"] = "0" + if self.pubnub.config.auth_key is not None: + params["auth"] = self.pubnub.config.auth_key + return params def build_path(self): diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 79d400ec..a2c5d9e0 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -14,6 +14,7 @@ def __init__(self): self.subscribe_key = None self.publish_key = None self.cipher_key = None + self.auth_key = None def validate(self): assert self.uuid is None or isinstance(self.uuid, str) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index e6aec398..6f9f6022 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -104,6 +104,31 @@ def test_pub_do_not_store(self): 'store': '0' }) + def test_pub_with_auth(self): + conf = copy.copy(pnconf) + conf.auth_key = "my_auth" + + pubnub = MagicMock( + spec=PubNub, + config=conf, + sdk_name=sdk_name, + uuid="UUID_PublishUnitTest" + ) + pub = Publish(pubnub) + message = "hey" + encoded_message = url_encode(message) + pub.channel("ch1").message(message) + + print(pub.build_path()) + self.assertEquals(pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" + % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) + + self.assertEqual(pub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': pubnub.uuid, + 'auth': conf.auth_key + }) + def test_pub_encrypted_list_message(self): conf = copy.copy(pnconf) conf.cipher_key = "testCipher" @@ -121,7 +146,6 @@ def test_pub_encrypted_list_message(self): pub.channel("ch1").message(message) - print(pub.build_path()) self.assertEquals(pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) From 87b2b9c06ea8681d455ba9ac925432fd132a32ad Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 21 May 2016 13:51:00 -0700 Subject: [PATCH 082/468] Add PublishSequenceManager for sync --- pubnub/endpoints/pubsub/publish.py | 8 +++--- pubnub/managers/__init__.py | 0 pubnub/managers/publish_sequence_manager.py | 13 +++++++++ pubnub/pubnub_core.py | 8 +++++- tests/functional/test_publish.py | 30 ++++++++++++++------- 5 files changed, 45 insertions(+), 14 deletions(-) create mode 100644 pubnub/managers/__init__.py create mode 100644 pubnub/managers/publish_sequence_manager.py diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index a48d22f8..985a4313 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -1,8 +1,7 @@ from pubnub import utils from pubnub import crypto as pn_crypto from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING, \ - PNERR_PUBLISH_META_WRONG_TYPE +from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.enums import HttpMethod @@ -13,8 +12,9 @@ class Publish(Endpoint): PUBLISH_GET_PATH = "/publish/%s/%s/0/%s/%s/%s" PUBLISH_POST_PATH = "/publish/%s/%s/0/%s/%s" - def __init__(self, pubnub): + def __init__(self, pubnub, publish_sequence_manager): Endpoint.__init__(self, pubnub) + self.publish_sequence_manager = publish_sequence_manager self._channel = None self._message = None self._should_store = None @@ -66,6 +66,8 @@ def build_params(self): if self.pubnub.config.auth_key is not None: params["auth"] = self.pubnub.config.auth_key + params['seqn'] = str(self.publish_sequence_manager.get_next_sequence()) + return params def build_path(self): diff --git a/pubnub/managers/__init__.py b/pubnub/managers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pubnub/managers/publish_sequence_manager.py b/pubnub/managers/publish_sequence_manager.py new file mode 100644 index 00000000..43c5a445 --- /dev/null +++ b/pubnub/managers/publish_sequence_manager.py @@ -0,0 +1,13 @@ +class PublishSequenceManager: + def __init__(self, provided_max_sequence): + self.max_sequence = provided_max_sequence + self.next_sequence = 0 + + # TODO: should be thread-safe + def get_next_sequence(self): + if self.max_sequence == self.next_sequence: + self.next_sequence = 1 + else: + self.next_sequence += 1 + + return self.next_sequence diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 65cab36a..58db5e65 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -5,6 +5,7 @@ from requests import ConnectionError from requests.packages.urllib3.exceptions import HTTPError +from .managers.publish_sequence_manager import PublishSequenceManager from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow from .structures import RequestOptions @@ -21,6 +22,9 @@ class PubNubCore: SDK_VERSION = "4.0.0" SDK_NAME = "PubNub-Python" + TIMESTAMP_DIVIDER = 1000 + MAX_SEQUENCE = 65535 + __metaclass__ = ABCMeta def __init__(self, config): @@ -32,6 +36,8 @@ def __init__(self, config): 'User-Agent': self.sdk_name } + self.publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + def request_sync(self, options): return pn_request(self.session, self.config.scheme_and_host(), self.headers, options, self.config.connect_timeout, self.config.non_subscribe_request_timeout) @@ -48,7 +54,7 @@ def here_now(self): return HereNow(self) def publish(self): - return Publish(self) + return Publish(self, self.publish_sequence_manager) @property def sdk_name(self): diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 6f9f6022..64ad4fbd 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -19,8 +19,11 @@ def setUp(self): config=pnconf, sdk_name=sdk_name ) + self.sm = MagicMock( + get_next_sequence=MagicMock(return_value=2) + ) self.pubnub.uuid = "UUID_PublishUnitTest" - self.pub = Publish(self.pubnub) + self.pub = Publish(self.pubnub, self.sm) def test_pub_message(self): message = "hi" @@ -33,7 +36,8 @@ def test_pub_message(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, - 'uuid': self.pubnub.uuid + 'uuid': self.pubnub.uuid, + 'seqn': '2' }) def test_pub_list_message(self): @@ -49,7 +53,8 @@ def test_pub_list_message(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, - 'uuid': self.pubnub.uuid + 'uuid': self.pubnub.uuid, + 'seqn': '2' }) def test_pub_with_meta(self): @@ -67,7 +72,8 @@ def test_pub_with_meta(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'meta': json.dumps(meta) + 'meta': json.dumps(meta), + 'seqn': '2' }) def test_pub_store(self): @@ -84,7 +90,8 @@ def test_pub_store(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'store': '1' + 'store': '1', + 'seqn': '2' }) def test_pub_do_not_store(self): @@ -101,7 +108,8 @@ def test_pub_do_not_store(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'store': '0' + 'store': '0', + 'seqn': '2' }) def test_pub_with_auth(self): @@ -114,7 +122,7 @@ def test_pub_with_auth(self): sdk_name=sdk_name, uuid="UUID_PublishUnitTest" ) - pub = Publish(pubnub) + pub = Publish(pubnub, self.sm) message = "hey" encoded_message = url_encode(message) pub.channel("ch1").message(message) @@ -126,7 +134,8 @@ def test_pub_with_auth(self): self.assertEqual(pub.build_params(), { 'pnsdk': sdk_name, 'uuid': pubnub.uuid, - 'auth': conf.auth_key + 'auth': conf.auth_key, + 'seqn': '2' }) def test_pub_encrypted_list_message(self): @@ -139,7 +148,7 @@ def test_pub_encrypted_list_message(self): sdk_name=sdk_name, uuid="UUID_PublishUnitTest" ) - pub = Publish(pubnub) + pub = Publish(pubnub, self.sm) message = ["hi", "hi2", "hi3"] encoded_message = "%22FQyKoIWWm7oN27zKyoU0bpjpgx49JxD04EI/0a8rg/o%3D%22" @@ -151,6 +160,7 @@ def test_pub_encrypted_list_message(self): self.assertEqual(pub.build_params(), { 'pnsdk': sdk_name, - 'uuid': pubnub.uuid + 'uuid': pubnub.uuid, + 'seqn': '2' }) From cd95eb2d1dec0ea32c404110abdd3ea2a520637e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 23 May 2016 12:40:53 -0700 Subject: [PATCH 083/468] Add publish errors tests --- pubnub/endpoints/endpoint.py | 14 +- pubnub/pubnub.py | 16 +- pubnub/pubnub_core.py | 4 + tests/integrational/native/test_publish.py | 174 +++++++++++++++------ 4 files changed, 149 insertions(+), 59 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 13116811..fd73afa2 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -48,22 +48,22 @@ def sync(self): return response def async(self, success, error): + try: self.validate_params() options = self.options() except PubNubException as e: - error(e) - return + return self.pubnub.async_error_to_return(e, error) def success_wrapper(server_response): success(self.create_response(server_response)) - def error_wrapper(msg): - error(PubNubException( - pn_error=msg - )) + # def error_wrapper(msg): + # error(PubNubException( + # pn_error=msg + # )) - return self.pubnub.request_async(options, success_wrapper, error_wrapper) + return self.pubnub.request_async(options, success_wrapper, error) def deferred(self): def handler(): diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index b23b409d..1608a7cd 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,7 +1,7 @@ import logging import threading -from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED +from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED, PNERR_UNKNOWN_ERROR from .exceptions import PubNubException from .pubnub_core import PubNubCore, pn_request @@ -26,6 +26,10 @@ def request_async(self, options, success, error): return thread + def async_error_to_return(self, e, errback): + errback(e) + return FakeThread() + def request_deferred(self, options_func): raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) @@ -53,3 +57,13 @@ def run(self): self.success(res) except PubNubException as e: self.error(e) + except Exception as e: + self.error(PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg=str(e) + )) + + +class FakeThread: + def join(self): + pass diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 58db5e65..e7d3285f 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -50,6 +50,10 @@ def request_async(self, options, success, error): def request_deferred(self, options_func): pass + @abstractmethod + def async_error_to_return(self, e, errback): + pass + def here_now(self): return HereNow(self) diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 29557124..565671b7 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -273,77 +273,149 @@ def test_publish_do_not_store(self): self.fail(e) -class xTestPubNubAsyncPublish(): - @vcr.use_cassette('integrational/fixtures/publish/async_success.yaml', - filter_query_parameters=['uuid']) - def test_success(self): - pubnub = PubNub(pnconf) +class TestPubNubAsyncSuccessPublish(unittest.TestCase): + def success(self, res): + assert isinstance(res, PNPublishResult) + assert res.timetoken > 1 - def success(res): - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + def error(self, e): + self.fail(e) - def error(e): - self.fail(e) + def assert_success_publish_get(self, msg): + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(msg) \ + .async(self.success, self.error) \ + .join() - thread = pubnub.publish() \ + def assert_success_publish_post(self, msg): + PubNub(pnconf).publish() \ .channel("ch1") \ - .message("hi") \ - .async(success, error) + .message(msg) \ + .use_post(True) \ + .async(self.success, self.error) \ + .join() + + def test_publish_get(self): + self.assert_success_publish_get("hi") + self.assert_success_publish_get(5) + self.assert_success_publish_get(True) + self.assert_success_publish_get(["hi", "hi2", "hi3"]) + self.assert_success_publish_get({"name": "Alex", "online": True}) + + def test_publish_post(self): + self.assert_success_publish_post("hi") + self.assert_success_publish_post(5) + self.assert_success_publish_post(True) + self.assert_success_publish_post(["hi", "hi2", "hi3"]) + self.assert_success_publish_post({"name": "Alex", "online": True}) - thread.join() + def test_publish_encrypted_list_get(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message(["encrypted", "list"]) \ + .async(self.success, self.error) \ + .join() - @vcr.use_cassette('integrational/fixtures/publish/async_success_list.yaml', - filter_query_parameters=['uuid']) - def test_success_list(self): - pubnub = PubNub(pnconf) + def test_publish_encrypted_string_get(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string") \ + .async(self.success, self.error) \ + .join() - def success(res): - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + def test_publish_encrypted_list_post(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message(["encrypted", "list"]) \ + .use_post(True) \ + .async(self.success, self.error) \ + .join() - def error(e): - self.fail(e) + def test_publish_encrypted_string_post(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string") \ + .use_post(True) \ + .async(self.success, self.error) \ + .join() + + def test_publish_with_meta(self): + meta = {'a': 2, 'b': 'qwer'} + + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("hey") \ + .meta(meta) \ + .async(self.success, self.error) \ + .join() - thread = pubnub.publish() \ + def test_publish_do_not_store(self): + PubNub(pnconf_enc).publish() \ .channel("ch1") \ - .message(["hi", "hi2", "hi3"]) \ - .async(success, error) + .message("hey") \ + .should_store(False) \ + .async(self.success, self.error) \ + .join() - thread.join() - def test_server_error(self): - config = PNConfiguration() - config.publish_key = "demo2" - config.subscribe_key = "demo" - await = threading.Event() +class TestPubNubAsyncErrorPublish(unittest.TestCase): + def success(self, res): + self.invalid_key_message = "Success callback invoked: " + str(res) - def success(): - await.set() + def error_invalid_key(self): + def handler(ex): + self.invalid_key_message = str(ex) - def error(e): - await.set() + return handler + + def test_invalid_key(self): + self.invalid_key_message = "" + config = PNConfiguration() + config.publish_key = "fake" + config.subscribe_key = "demo" - thread = PubNub(config).publish() \ + PubNub(config).publish() \ .channel("ch1") \ .message("hey") \ - .async(success, error) + .async(self.success, self.error_invalid_key()) \ + .join() - res = await.wait() - # thread.join() + assert "HTTP Client Error (400):" in self.invalid_key_message + assert "Invalid Key" in self.invalid_key_message - def test_post(self): - def success(res): - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 - - def error(e): - self.fail(e) + def error_missing_message(self, err): + assert "Message missing" in str(err) + pass - thread = PubNub(pnconf).publish() \ + def test_missing_message(self): + PubNub(pnconf).publish() \ .channel("ch1") \ + .message(None) \ + .async(self.success, self.error_missing_message) \ + .join() + + def error_missing_channel(self, err): + assert "Channel missing" in str(err) + pass + + def test_missing_chanel(self): + PubNub(pnconf).publish() \ + .channel("") \ .message("hey") \ - .use_post(True) \ - .async(success, error) + .async(self.success, self.error_missing_channel) \ + .join() + + def error_non_serializable(self, err): + assert "not JSON serializable" in str(err) + pass - thread.join() + def test_non_serializable(self): + def method(): + pass + + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(method) \ + .async(self.success, self.error_non_serializable) \ + .join() From 85b70367eaeefb8fbfd052280331470e37c8ef73 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 00:55:36 -0700 Subject: [PATCH 084/468] Fix tornado & twisted async handlers --- pubnub/pubnub_tornado.py | 3 +++ pubnub/pubnub_twisted.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 22c44394..25677dc5 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -52,6 +52,9 @@ def __init__(self, config): 'Accept-Encoding': 'utf-8' } + def async_error_to_return(self, e, errback): + errback(e) + def request_async(self, options, success, error): def _invoke(func, data): if func is not None: diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 95f92291..94b98cd4 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -83,6 +83,9 @@ def cancel(): return cancel + def async_error_to_return(self, e, errback): + errback(e) + def request_async(self, options, success, error): """ Request in non-common for Twisted way - using callbacks From 67b7e2a7240e91b750db2c45c10773040892459e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 01:19:44 -0700 Subject: [PATCH 085/468] Add twisted publish basic tests --- tests/integrational/tornado/test_publish.py | 115 +++++++------------- 1 file changed, 42 insertions(+), 73 deletions(-) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index eecb2a45..c74b813d 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -3,11 +3,13 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub_tornado import PubNubTornado -from tests.helper import pnconf +from tests.helper import pnconf, pnconf_enc + +channel = "tornado-int-publish" class TestPubNubAsyncPublish(AsyncTestCase): - def test_publish_string_via_get(self): + def assert_success(self, pub): pubnub = PubNubTornado(pnconf) pubnub.set_ioloop(self.io_loop) @@ -23,84 +25,51 @@ def error(err): self.stop() self.fail("Error while success is expected: " + str(err)) - pubnub.publish() \ - .channel("my_channel") \ - .message("async hello string using GET") \ - .async(success, error) + pub.async(success, error) pubnub.start() self.wait() - def test_publish_list_via_get(self): - pubnub = PubNubTornado(pnconf) - pubnub.set_ioloop(self.io_loop) + def assert_success_publish_get(self, msg): + self.assert_success( + PubNubTornado(pnconf).publish().channel("my_channel").message(msg)) - def success(res): - pubnub.stop() - self.stop() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 0 - assert len(res.original_response) > 0 + def assert_success_publish_post(self, msg): + self.assert_success( + PubNubTornado(pnconf).publish().channel("my_channel").message(msg).use_post(True)) - def error(err): - pubnub.stop() - self.stop() - self.fail("Error while success is expected: " + str(err)) + def assert_success_publish_get_encrypted(self, msg): + self.assert_success( + PubNubTornado(pnconf_enc).publish().channel("my_channel").message(msg)) - pubnub.publish() \ - .channel("my_channel") \ - .message(["async", "hello", "list", "using GET"]) \ - .async(success, error) + def assert_success_publish_post_encrypted(self, msg): + self.assert_success( + PubNubTornado(pnconf_enc).publish().channel("my_channel").message(msg).use_post(True)) - pubnub.start() - self.wait() + def test_publish_string_via_get(self): + self.assert_success_publish_get("hi") + self.assert_success_publish_get(5) + self.assert_success_publish_get(True) + self.assert_success_publish_get(["hi", "hi2", "hi3"]) + self.assert_success_publish_get({"name": "Alex", "online": True}) def test_publish_string_via_post(self): - pubnub = PubNubTornado(pnconf) - pubnub.set_ioloop(self.io_loop) - - def success(res): - pubnub.stop() - self.stop() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 0 - assert len(res.original_response) > 0 - - def error(err): - pubnub.stop() - self.stop() - self.fail("Error while success is expected: " + str(err)) - - pubnub.publish() \ - .channel("my_channel") \ - .message("async hello string using POST") \ - .use_post(True) \ - .async(success, error) - - pubnub.start() - self.wait() - - def test_publish_list_via_post(self): - pubnub = PubNubTornado(pnconf) - pubnub.set_ioloop(self.io_loop) - - def success(res): - pubnub.stop() - self.stop() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 0 - assert len(res.original_response) > 0 - - def error(err): - pubnub.stop() - self.stop() - self.fail("Error while success is expected: " + str(err)) - - pubnub.publish() \ - .channel("my_channel") \ - .message(["async", "hello", "list", "using POST"]) \ - .use_post(True) \ - .async(success, error) - - pubnub.start() - self.wait() + self.assert_success_publish_post("hi") + self.assert_success_publish_post(5) + self.assert_success_publish_post(True) + self.assert_success_publish_post(["hi", "hi2", "hi3"]) + self.assert_success_publish_post({"name": "Alex", "online": True}) + + def test_publish_string_via_get_encrypted(self): + self.assert_success_publish_get_encrypted("hi") + self.assert_success_publish_get_encrypted(5) + self.assert_success_publish_get_encrypted(True) + self.assert_success_publish_get_encrypted(["hi", "hi2", "hi3"]) + self.assert_success_publish_get_encrypted({"name": "Alex", "online": True}) + + def test_publish_string_via_post_encrypted(self): + self.assert_success_publish_post_encrypted("hi") + self.assert_success_publish_post_encrypted(5) + self.assert_success_publish_post_encrypted(True) + self.assert_success_publish_post_encrypted(["hi", "hi2", "hi3"]) + self.assert_success_publish_post_encrypted({"name": "Alex", "online": True}) \ No newline at end of file From 740b51df3dd6ef2ca982b02deb693367d22988bd Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 01:49:37 -0700 Subject: [PATCH 086/468] Fix publish tornado tests --- tests/integrational/tornado/test_publish.py | 49 +++++++++++++++------ 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index c74b813d..18f69c5f 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -10,41 +10,61 @@ class TestPubNubAsyncPublish(AsyncTestCase): def assert_success(self, pub): - pubnub = PubNubTornado(pnconf) - pubnub.set_ioloop(self.io_loop) + self.pubnub.set_ioloop(self.io_loop) def success(res): - pubnub.stop() + self.pubnub.stop() self.stop() assert isinstance(res, PNPublishResult) assert res.timetoken > 0 assert len(res.original_response) > 0 def error(err): - pubnub.stop() + self.pubnub.stop() self.stop() self.fail("Error while success is expected: " + str(err)) pub.async(success, error) - pubnub.start() + self.pubnub.start() self.wait() def assert_success_publish_get(self, msg): - self.assert_success( - PubNubTornado(pnconf).publish().channel("my_channel").message(msg)) + self.pubnub = PubNubTornado(pnconf) + self.assert_success(self.pubnub.publish().channel("my_channel").message(msg)) def assert_success_publish_post(self, msg): - self.assert_success( - PubNubTornado(pnconf).publish().channel("my_channel").message(msg).use_post(True)) + self.pubnub = PubNubTornado(pnconf) + self.assert_success(self.pubnub.publish().channel("my_channel").message(msg).use_post(True)) def assert_success_publish_get_encrypted(self, msg): - self.assert_success( - PubNubTornado(pnconf_enc).publish().channel("my_channel").message(msg)) + self.pubnub = PubNubTornado(pnconf_enc) + self.assert_success(self.pubnub.publish().channel("my_channel").message(msg)) def assert_success_publish_post_encrypted(self, msg): - self.assert_success( - PubNubTornado(pnconf_enc).publish().channel("my_channel").message(msg).use_post(True)) + self.pubnub = PubNubTornado(pnconf_enc) + self.assert_success(self.pubnub.publish().channel("my_channel").message(msg).use_post(True)) + + def assert_error(self, pub): + pubnub = PubNubTornado(pnconf) + pubnub.set_ioloop(self.io_loop) + + def success(res): + pubnub.stop() + self.stop() + assert isinstance(res, PNPublishResult) + assert res.timetoken > 0 + assert len(res.original_response) > 0 + + def error(err): + pubnub.stop() + self.stop() + self.fail("Error while success is expected: " + str(err)) + + pub.async(success, error) + + pubnub.start() + self.wait() def test_publish_string_via_get(self): self.assert_success_publish_get("hi") @@ -72,4 +92,5 @@ def test_publish_string_via_post_encrypted(self): self.assert_success_publish_post_encrypted(5) self.assert_success_publish_post_encrypted(True) self.assert_success_publish_post_encrypted(["hi", "hi2", "hi3"]) - self.assert_success_publish_post_encrypted({"name": "Alex", "online": True}) \ No newline at end of file + self.assert_success_publish_post_encrypted({"name": "Alex", "online": True}) + From 63d3688764630d65198fde0f2f086ccd808aa031 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 02:24:01 -0700 Subject: [PATCH 087/468] Add publish tornado errors tests --- tests/integrational/tornado/test_publish.py | 58 +++++++++++++++------ 1 file changed, 42 insertions(+), 16 deletions(-) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 18f69c5f..ca506826 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -1,11 +1,12 @@ from tornado.testing import AsyncTestCase from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_tornado import PubNubTornado from tests.helper import pnconf, pnconf_enc -channel = "tornado-int-publish" +ch = "tornado-int-publish" class TestPubNubAsyncPublish(AsyncTestCase): @@ -31,39 +32,34 @@ def error(err): def assert_success_publish_get(self, msg): self.pubnub = PubNubTornado(pnconf) - self.assert_success(self.pubnub.publish().channel("my_channel").message(msg)) + self.assert_success(self.pubnub.publish().channel(ch).message(msg)) def assert_success_publish_post(self, msg): self.pubnub = PubNubTornado(pnconf) - self.assert_success(self.pubnub.publish().channel("my_channel").message(msg).use_post(True)) + self.assert_success(self.pubnub.publish().channel(ch).message(msg).use_post(True)) def assert_success_publish_get_encrypted(self, msg): self.pubnub = PubNubTornado(pnconf_enc) - self.assert_success(self.pubnub.publish().channel("my_channel").message(msg)) + self.assert_success(self.pubnub.publish().channel(ch).message(msg)) def assert_success_publish_post_encrypted(self, msg): self.pubnub = PubNubTornado(pnconf_enc) - self.assert_success(self.pubnub.publish().channel("my_channel").message(msg).use_post(True)) - - def assert_error(self, pub): - pubnub = PubNubTornado(pnconf) - pubnub.set_ioloop(self.io_loop) + self.assert_success(self.pubnub.publish().channel(ch).message(msg).use_post(True)) + def assert_error(self, pub, expected_err_msg): def success(res): - pubnub.stop() + self.pubnub.stop() self.stop() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 0 - assert len(res.original_response) > 0 + self.fail("Success while while is expected: " + str(res)) def error(err): - pubnub.stop() + self.pubnub.stop() self.stop() - self.fail("Error while success is expected: " + str(err)) + assert expected_err_msg in str(err) pub.async(success, error) - pubnub.start() + self.pubnub.start() self.wait() def test_publish_string_via_get(self): @@ -94,3 +90,33 @@ def test_publish_string_via_post_encrypted(self): self.assert_success_publish_post_encrypted(["hi", "hi2", "hi3"]) self.assert_success_publish_post_encrypted({"name": "Alex", "online": True}) + def test_error_missing_message(self): + self.pubnub = PubNubTornado(pnconf) + self.pubnub.set_ioloop(self.io_loop) + + self.assert_error(self.pubnub.publish().channel(ch).message(None), "Message missing") + + def test_error_missing_channel(self): + self.pubnub = PubNubTornado(pnconf) + self.pubnub.set_ioloop(self.io_loop) + + self.assert_error(self.pubnub.publish().channel("").message("hey"), "Channel missing") + + def test_error_non_serializable(self): + self.pubnub = PubNubTornado(pnconf) + self.pubnub.set_ioloop(self.io_loop) + + def method(): + pass + + self.assert_error(self.pubnub.publish().channel(ch).message(method), "not JSON serializable") + + def test_error_invalid_key(self): + conf = PNConfiguration() + conf.publish_key = "fake" + conf.subscribe_key = "demo" + + self.pubnub = PubNubTornado(conf) + self.pubnub.set_ioloop(self.io_loop) + + self.assert_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") From 6cba0c9bc5294d327647d6105a545ed8a9236b1a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 03:01:16 -0700 Subject: [PATCH 088/468] Add tornado publish meta and storage tests --- pubnub/pubnub_tornado.py | 7 ++++--- pubnub/structures.py | 9 ++++++--- pubnub/utils.py | 2 +- tests/integrational/tornado/test_publish.py | 19 +++++++++++++++++-- tests/unit/test_utils.py | 4 ++-- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 25677dc5..54865a9c 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,4 +1,5 @@ import json +import logging import time from . import utils @@ -11,6 +12,7 @@ from tornado.concurrent import Future default_ioloop = tornado.ioloop.IOLoop.instance() +logger = logging.getLogger("pubnub") class PubNubTornado(PubNubCore): @@ -61,9 +63,8 @@ def _invoke(func, data): func(data) url = utils.build_url(self.config.scheme(), self.config.origin, - options.path, options.params) - # TODO: encode url - # url = self.getUrl(url, encoder_map) + options.path, options.query_string) + logger.debug("%s %s %s" % (options.method_string, url, options.data)) request = tornado.httpclient.HTTPRequest( url=url, diff --git a/pubnub/structures.py b/pubnub/structures.py index 00ac90d4..0d6cf0a6 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -23,8 +23,7 @@ def method_string(self): def is_post(self): return self._method is HttpMethod.POST - @property - def query_string(self, do_not_encode=None): + def query_list(self, do_not_encode=None): # TODO: add option to sort params alphabetically(for PAM requests) if do_not_encode is None: do_not_encode = [] @@ -37,4 +36,8 @@ def query_string(self, do_not_encode=None): continue s.append(e(k) + "=" + e(v)) - return str('&'.join(s)) + return s + + @property + def query_string(self): + return str('&'.join(self.query_list())) diff --git a/pubnub/utils.py b/pubnub/utils.py index d5d8e700..e48892ae 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -51,4 +51,4 @@ def uuid(): def build_url(scheme, origin, path, params): - return pn_urlunsplit((scheme, origin, path, pn_urlencode(params), '')) + return pn_urlunsplit((scheme, origin, path, params, '')) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index ca506826..0748ef76 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -1,11 +1,14 @@ -from tornado.testing import AsyncTestCase +import logging +import pubnub +from tornado.testing import AsyncTestCase from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration - from pubnub.pubnub_tornado import PubNubTornado from tests.helper import pnconf, pnconf_enc +pubnub.set_stream_logger('pubnub', logging.DEBUG) + ch = "tornado-int-publish" @@ -120,3 +123,15 @@ def test_error_invalid_key(self): self.pubnub.set_ioloop(self.io_loop) self.assert_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") + + def test_publish_with_meta(self): + self.pubnub = PubNubTornado(pnconf) + + self.assert_success( + self.pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + + def test_publish_do_not_store(self): + self.pubnub = PubNubTornado(pnconf) + + self.assert_success( + self.pubnub.publish().channel(ch).message("hey").should_store(False)) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index c4f7569e..c94a81ab 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -46,7 +46,7 @@ def match(expected_str, actual_str): self.assertEqual(parse_qs(expected.query), parse_qs(actual.query)) match("http://ex.com/news?a=2&b=qwer", - build_url("http", "ex.com", "/news", {"a": 2, "b": "qwer"})) + build_url("http", "ex.com", "/news", "a=2&b=qwer")) match("https://ex.com/?a=2&b=qwer", - build_url("https", "ex.com", "/", {"a": 2, "b": "qwer"})) + build_url("https", "ex.com", "/", "a=2&b=qwer")) From 023d9e567676e60646b4bade49c2f7c123423c84 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 03:25:45 -0700 Subject: [PATCH 089/468] Fix twisted string builder --- pubnub/pubnub_twisted.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 94b98cd4..17899c3b 100755 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -123,7 +123,7 @@ def request_deferred(self, options_func): return defer.fail(e) url = utils.build_url(self.config.scheme(), self.config.origin, - options.path, options.params) + options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, url, options.data)) From 6b694f69a2366dde6d89df991f0a1eae5560e7a3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 09:05:07 -0700 Subject: [PATCH 090/468] Finished with twisted publish success and errors tests --- tests/integrational/twisted/test_publish.py | 144 ++++++++++++-------- 1 file changed, 88 insertions(+), 56 deletions(-) diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py index cd736c4e..7aa369ac 100644 --- a/tests/integrational/twisted/test_publish.py +++ b/tests/integrational/twisted/test_publish.py @@ -7,16 +7,20 @@ import logging import pubnub +from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_twisted import PubNubTwisted from tests.helper import pnconf pubnub.set_stream_logger('pubnub', logging.DEBUG) defer.setDebugging(True) +ch = "twisted-int-publish" -class TestPubNubPublish(unittest.TestCase): + +class TwistedTest(unittest.TestCase): def setUp(self): - self.pool = HTTPConnectionPool(reactor, False) + self.pool = HTTPConnectionPool(reactor, False) + self.pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) def tearDown(self): def _check_fds(_): @@ -27,81 +31,109 @@ def _check_fds(_): return self.pool.closeCachedConnections().addBoth(_check_fds) - def success(self, res, third=None): + +class TestPubNubPublishSuccess(TwistedTest): + def callback(self, res, third=None): print(res.timetoken) assert res.timetoken > 0 - def error(self, error): + def errback(self, error): return defer.fail(error) - def test_publish_deferred(self): + def assert_success(self, pub): d = defer.Deferred() + pub.deferred().addCallback(self.callback, self.errback).addCallbacks(d.callback, d.errback) + return d - pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + def assert_success_publish_get(self, msg): + return self.assert_success( + PubNubTwisted(pnconf, reactor=reactor, pool=self.pool).publish().channel(ch).message(msg)) - pubnub.publish() \ - .channel("my_channel") \ - .message("deferred hello using GET") \ - .deferred() \ - .addCallback(self.success) \ - .addCallbacks(d.callback, d.errback) + def assert_success_publish_post(self, msg): + return self.assert_success( + PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + .publish().channel(ch).message(msg).use_post(True)) - return d + def test_success_publish_string_get(self): + return self.assert_success_publish_get("hey") - def test_publish_sync(self): - pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + def test_success_publish_int_get(self): + return self.assert_success_publish_get(5) - res = pubnub.publish() \ - .channel("my_channel") \ - .message("sync hello using GET") \ - .sync() + def test_success_publish_bool_get(self): + return self.assert_success_publish_get(True) - assert res.timetoken > 0 + def test_success_publish_list_get(self): + return self.assert_success_publish_get(["hi", "hi2", "hi3"]) - def test_publish_list_deferred(self): - d = defer.Deferred() + def test_success_publish_dict_get(self): + return self.assert_success_publish_get({"name": "Alex", "online": True}) - pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + def test_success_publish_string_post(self): + return self.assert_success_publish_get("hey") - pubnub.publish() \ - .channel("my_channel") \ - .message(["deferred", "hello", "using", "GET"]) \ - .deferred() \ - .addCallback(self.success) \ - .addCallbacks(d.callback, d.errback) + def test_success_publish_int_post(self): + return self.assert_success_publish_get(5) - return d + def test_success_publish_bool_post(self): + return self.assert_success_publish_get(True) - def test_publish_post_deferred(self): - d = defer.Deferred() + def test_success_publish_list_post(self): + return self.assert_success_publish_get(["hi", "hi2", "hi3"]) - # delayedCall = reactor.callLater(3, d.cancel) - # - # def gotResult(result): - # if delayedCall.active(): - # delayedCall.cancel() - # return result - - PubNubTwisted(pnconf, reactor=reactor, pool=self.pool).publish() \ - .channel("my_channel") \ - .message("deferred string hello using POST") \ - .use_post(True) \ - .deferred() \ - .addCallback(self.success, self.error) \ - .addCallbacks(d.callback, d.errback) - # .addBoth(gotResult) + def test_success_publish_dict_post(self): + return self.assert_success_publish_get({"name": "Alex", "online": True}) - return d - def test_publish_post_list_deferred(self): - d = defer.Deferred() +class TestPubNubPublishError(TwistedTest): + def callback(self, res, third=None): + return defer.fail("Success while while is expected: " + str(res)) + + def errback_message_missing(self, error): + self.assertIn("Message missing", error.getErrorMessage()) + return defer.succeed(None) + + def errback_channel_missing(self, error): + self.assertIn("Channel missing", error.getErrorMessage()) + return defer.succeed(None) - PubNubTwisted(pnconf, reactor=reactor, pool=self.pool).publish() \ - .channel("my_channel") \ - .message(["deferred", "list", "using", "POST"]) \ - .use_post(True) \ - .deferred() \ - .addCallback(self.success, self.error) \ + def errback_non_serializable(self, error): + self.assertIn("not JSON serializable", error.getErrorMessage()) + return defer.succeed(None) + + def errback_invalid_key(self, error): + self.assertIn("HTTP Client Error (400)", error.getErrorMessage()) + self.assertIn("Invalid Key", error.getErrorMessage()) + return defer.succeed(None) + + def assert_error(self, pub, errback): + d = defer.Deferred() + pub.deferred()\ + .addCallbacks(self.callback, errback) \ .addCallbacks(d.callback, d.errback) return d + + def test_error_missing_message(self): + return self.assert_error(self.pubnub.publish().channel(ch).message(None), + self.errback_message_missing) + + def test_error_missing_channel(self): + return self.assert_error(self.pubnub.publish().channel("").message("hey"), + self.errback_channel_missing) + + def test_error_non_serializable(self): + def method(): + pass + + return self.assert_error(self.pubnub.publish().channel(ch).message(method), + self.errback_non_serializable) + + def test_error_invalid_key(self): + conf = PNConfiguration() + conf.publish_key = "fake" + conf.subscribe_key = "demo" + self.pubnub = PubNubTwisted(conf, reactor=reactor, pool=self.pool) + + return self.assert_error(self.pubnub.publish().channel(ch).message("hey"), + self.errback_invalid_key) From 3417a13747f1d85a45213a4f1e86d307eb1026e5 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 May 2016 10:59:19 -0700 Subject: [PATCH 091/468] Add publish twisted meta and should_store tests --- tests/integrational/twisted/test_publish.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py index 7aa369ac..0f8c22ec 100644 --- a/tests/integrational/twisted/test_publish.py +++ b/tests/integrational/twisted/test_publish.py @@ -84,6 +84,16 @@ def test_success_publish_list_post(self): def test_success_publish_dict_post(self): return self.assert_success_publish_get({"name": "Alex", "online": True}) + def test_success_publish_do_not_store(self): + return self.assert_success( + PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + .publish().channel(ch).message("hey").should_store(False)) + + def test_success_publish_with_meta(self): + return self.assert_success( + PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + .publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + class TestPubNubPublishError(TwistedTest): def callback(self, res, third=None): From f1e7a6b3dbb62a0edc25d5655cd27df54f60804a Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Thu, 2 Jun 2016 11:11:30 +0200 Subject: [PATCH 092/468] updated crypto --- pubnub.py | 13 ++++++++++--- setup.py | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/pubnub.py b/pubnub.py index 15131fbe..bed550ae 100755 --- a/pubnub.py +++ b/pubnub.py @@ -258,7 +258,12 @@ def encrypt(self, key, msg): secret = self.getSecret(key) Initial16bytes = '0123456789012345' - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + + # import code; + # code.interact(local=dict(globals(), **locals())) + + cipher = AES.new(bytes(secret[0:32], "UTF-8"), AES.MODE_CBC, bytes(Initial16bytes, "UTF-8")) + return encodestring( cipher.encrypt(self.pad(msg.encode('utf-8')))).decode('utf-8') @@ -266,7 +271,9 @@ def decrypt(self, key, msg): secret = self.getSecret(key) Initial16bytes = '0123456789012345' - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + + cipher = AES.new(bytes(secret[0:32], "UTF-8"), AES.MODE_CBC, bytes(Initial16bytes, "UTF-8")) + return (cipher.decrypt( decodestring(msg.encode('utf-8')))).decode('utf-8') @@ -298,7 +305,7 @@ def __init__( """ self.origin = origin - self.version = '3.7.6' + self.version = '3.7.7' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key diff --git a/setup.py b/setup.py index 295969e5..e9b53a6b 100755 --- a/setup.py +++ b/setup.py @@ -19,8 +19,8 @@ 'Topic :: Software Development :: Libraries :: Python Modules', ), install_requires=[ - 'pycrypto>=2.6.1', - 'requests>=2.4.0' + 'pycryptodome>=3.3', + 'requests>=2.4' ], zip_safe=False, ) From b988576f221a02f81c6ec1380864db4051d0df27 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 3 Jun 2016 06:14:23 -0700 Subject: [PATCH 093/468] Add a basic subscribe --- pubnub/builders.py | 55 ++++ pubnub/callbacks.py | 23 ++ pubnub/dtos.py | 11 + pubnub/endpoints/endpoint.py | 102 ++++++-- pubnub/endpoints/pubsub/publish.py | 14 +- pubnub/endpoints/pubsub/subscribe.py | 97 +++++++ pubnub/enums.py | 45 ++++ pubnub/errors.py | 1 + pubnub/managers.py | 211 +++++++++++++++ pubnub/managers/publish_sequence_manager.py | 13 - pubnub/models/consumer/common.py | 21 ++ pubnub/models/consumer/pn_error_data.py | 7 + pubnub/models/consumer/pubsub.py | 41 +++ .../{managers => models/server}/__init__.py | 0 pubnub/models/server/subscribe.py | 92 +++++++ pubnub/models/subscription_item.py | 4 + pubnub/pnconfiguration.py | 2 + pubnub/pubnub.py | 246 ++++++++++++++++-- pubnub/pubnub_core.py | 87 +------ pubnub/structures.py | 12 +- pubnub/utils.py | 42 ++- pubnub/workers.py | 80 ++++++ tests/functional/test_subscribe.py | 132 ++++++++++ tests/helper.py | 40 +++ tests/integrational/native/test_publish.py | 125 +++++---- tests/integrational/native/test_subscribe.py | 59 +++++ 26 files changed, 1361 insertions(+), 201 deletions(-) create mode 100644 pubnub/builders.py create mode 100644 pubnub/callbacks.py create mode 100644 pubnub/dtos.py create mode 100644 pubnub/endpoints/pubsub/subscribe.py create mode 100644 pubnub/managers.py delete mode 100644 pubnub/managers/publish_sequence_manager.py create mode 100644 pubnub/models/consumer/common.py create mode 100644 pubnub/models/consumer/pn_error_data.py rename pubnub/{managers => models/server}/__init__.py (100%) create mode 100644 pubnub/models/server/subscribe.py create mode 100644 pubnub/models/subscription_item.py create mode 100644 pubnub/workers.py create mode 100644 tests/functional/test_subscribe.py create mode 100644 tests/integrational/native/test_subscribe.py diff --git a/pubnub/builders.py b/pubnub/builders.py new file mode 100644 index 00000000..81b36056 --- /dev/null +++ b/pubnub/builders.py @@ -0,0 +1,55 @@ +from abc import ABCMeta, abstractmethod + +from .dtos import SubscribeOperation + + +class PubSubBuilder(object): + __metaclass__ = ABCMeta + + def __init__(self, subscription_manager): + self._subscription_manager = subscription_manager + self._channel_subscriptions = [] + self._channel_group_subscriptions = [] + + def channels(self, channels_list): + self._channel_subscriptions.extend(channels_list) + return self + + def channel_groups(self, channel_groups_list): + self._channel_group_subscriptions.extend(channel_groups_list) + return self + + @abstractmethod + def execute(self): + pass + + +class SubscribeBuilder(PubSubBuilder): + def __init__(self, subscription_manager): + super(SubscribeBuilder, self).__init__(subscription_manager) + self._presence_enabled = False + self._timetoken = 0L + + def with_presence(self): + self._presence_enabled = True + return self + + def with_timetoken(self, timetoken): + self._timetoken = timetoken + return self + + def channel_subscriptions(self): + return self._channel_subscriptions + + def channel_group_subscriptions(self): + return self._channel_group_subscriptions + + def execute(self): + subscribe_operation = SubscribeOperation( + channels=self._channel_subscriptions, + channel_groups=self._channel_group_subscriptions, + timetoken=self._timetoken, + presence_enabled=self._presence_enabled + ) + + self._subscription_manager.adapt_subscribe_builder(subscribe_operation) diff --git a/pubnub/callbacks.py b/pubnub/callbacks.py new file mode 100644 index 00000000..13a24794 --- /dev/null +++ b/pubnub/callbacks.py @@ -0,0 +1,23 @@ +from abc import ABCMeta, abstractmethod + + +class PNCallback(object): + @abstractmethod + def on_response(self, x, status): + pass + + +class SubscribeCallback(object): + __metaclass__ = ABCMeta + + @abstractmethod + def status(self, pubnub, status): + pass + + @abstractmethod + def message(self, pubnub, message): + pass + + @abstractmethod + def presence(self, pubnub, presence): + pass diff --git a/pubnub/dtos.py b/pubnub/dtos.py new file mode 100644 index 00000000..5c6f6cbd --- /dev/null +++ b/pubnub/dtos.py @@ -0,0 +1,11 @@ +class SubscribeOperation(object): + def __init__(self, channels=None, channel_groups=None, presence_enabled=None, timetoken=None): + assert isinstance(channels, (list, tuple)) + assert isinstance(channel_groups, (list, tuple)) + assert isinstance(presence_enabled, bool) + assert isinstance(timetoken, long) + + self.channels = channels + self.channel_groups = channel_groups + self.presence_enabled = presence_enabled + self.timetoken = timetoken diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index fd73afa2..e0156d7f 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,15 +1,29 @@ +import threading from abc import ABCMeta, abstractmethod +from pubnub.enums import PNStatusCategory from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING from pubnub.exceptions import PubNubException -from ..structures import RequestOptions +from pubnub.models.consumer.common import PNStatus +from pubnub.models.consumer.pn_error_data import PNErrorData +from ..structures import RequestOptions, ResponseInfo -class Endpoint: +class Endpoint(object): + SERVER_RESPONSE_SUCCESS = 200 + SERVER_RESPONSE_FORBIDDEN = 403 + SERVER_RESPONSE_BAD_REQUEST = 400 + __metaclass__ = ABCMeta def __init__(self, pubnub): self.pubnub = pubnub + # TODO: this is a platform-dependent operation + self._cancellation_event = threading.Event() + + def cancellation_event(self, event): + assert isinstance(event, threading.Event()) + self._cancellation_event = event @abstractmethod def build_path(self): @@ -34,6 +48,20 @@ def validate_params(self): def create_response(self, endpoint): pass + @abstractmethod + def operation_type(self): + pass + + @abstractmethod + def name(self): + pass + + def affected_channels(self): + return None + + def affected_channels_groups(self): + return None + def options(self): return RequestOptions(self.build_path(), self.build_params(), self.http_method(), self.build_data()) @@ -41,37 +69,32 @@ def options(self): def sync(self): self.validate_params() - server_response = self.pubnub.request_sync(self.options()) - - response = self.create_response(server_response) - - return response - - def async(self, success, error): + raw_response = self.pubnub.request_sync(self.options()) + return self.create_response(raw_response.json()) + def async(self, callback): try: self.validate_params() options = self.options() except PubNubException as e: - return self.pubnub.async_error_to_return(e, error) + callback(None, self.create_status_response(PNStatusCategory.PNBadRequestCategory, None, None, e)) + return - def success_wrapper(server_response): - success(self.create_response(server_response)) + def callback_wrapper(status_category, response, response_info, exception): + callback( + self.create_response(response), + self.create_status_response(status_category, response, response_info, exception) + ) - # def error_wrapper(msg): - # error(PubNubException( - # pn_error=msg - # )) - - return self.pubnub.request_async(options, success_wrapper, error) + return self.pubnub.request_async(self.name(), options, callback_wrapper, self._cancellation_event) def deferred(self): def handler(): self.validate_params() return self.options() - return self.pubnub\ - .request_deferred(handler)\ + return self.pubnub \ + .request_deferred(handler) \ .addCallback(self.create_response) def default_params(self): @@ -88,6 +111,45 @@ def validate_publish_key(self): if self.pubnub.config.publish_key is None or len(self.pubnub.config.publish_key) == 0: raise PubNubException(pn_error=PNERR_PUBLISH_KEY_MISSING) + def create_status_response(self, category, response, response_info, exception): + """ + Used only by async requests + + :param category: of response + :param response_info: unified response info + :param response: already decoded json data + :param exception: if any + :return: + """ + + if response_info is not None: + assert isinstance(response_info, ResponseInfo) + + pn_status = PNStatus() + + if response is None or exception is not None: + pn_status.error = True + + if exception is not None: + pn_status.error_data = PNErrorData(str(exception), exception) + + if response_info is not None: + + pn_status.status_code = response_info.status_code + pn_status.tls_enabled = response_info.tls_enabled + pn_status.origin = response_info.origin + pn_status.uuid = response_info.uuid + pn_status.auth_key = response_info.auth_key + pn_status.client_request = response_info.client_request + + pn_status.operation = self.operation_type() + pn_status.category = category + pn_status.affected_channels = self.affected_channels() + pn_status.affected_channels_groups = self.affected_channels_groups() + + return pn_status + + # TODO: move to utils? @classmethod def join_query(cls, params): query_list = [] diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 985a4313..d4e80817 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -4,7 +4,7 @@ from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult -from pubnub.enums import HttpMethod +from pubnub.enums import HttpMethod, PNOperationType class Publish(Endpoint): @@ -116,3 +116,15 @@ def create_response(self, envelope): res = PNPublishResult(envelope, timetoken) return res + + def affected_channels(self): + return None + + def affected_channels_groups(self): + return None + + def operation_type(self): + return PNOperationType.PNPublishOperation + + def name(self): + return "Publish" diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py new file mode 100644 index 00000000..6fcb75fd --- /dev/null +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -0,0 +1,97 @@ +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING +from pubnub.exceptions import PubNubException +from pubnub.models.server.subscribe import SubscribeEnvelope, SubscribeMessage, SubscribeMetadata + + +class Subscribe(Endpoint): + # /subscribe//// + SUBSCRIBE_PATH = "/v2/subscribe/%s/%s/0" + + def __init__(self, pubnub): + super(Subscribe, self).__init__(pubnub) + self._channels = [] + self._groups = [] + + self._region = None + self._filter_expression = None + self._timetoken = None + self._with_presence = None + + def channels(self, channels): + if isinstance(channels, (list, tuple)): + self._channels.extend(channels) + else: + self._channels.extend(utils.split_items(channels)) + + return self + + def groups(self, groups): + if isinstance(groups, (list, tuple)): + self._groups.extend(groups) + else: + self._groups.extend(utils.split_items(groups)) + + return self + + def timetoken(self, timetoken): + self._timetoken = timetoken + + return self + + def filter_expression(self, expr): + self._filter_expression = expr + + return self + + def region(self, region): + self._region = region + + return self + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if len(self._channels) == 0 and len(self._groups) == 0: + raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) + + def build_path(self): + channels = "," if len(self._channels) is 0 else utils.join_items(self._channels) + return Subscribe.SUBSCRIBE_PATH % (self.pubnub.config.subscribe_key, channels) + + def build_params(self): + params = self.default_params() + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items(self._groups) + + if self._filter_expression is not None and len(self._filter_expression) > 0: + params['filter-expr'] = self._filter_expression + + if self._timetoken is not None: + params['tt'] = str(self._timetoken) + + if self._region is not None: + params['tr'] = self._region + + return params + + def create_response(self, envelope): + return envelope + + def affected_channels(self): + return None + + def affected_channels_groups(self): + return None + + def operation_type(self): + return PNOperationType.PNSubscribeOperation + + def name(self): + return "Subscribe" diff --git a/pubnub/enums.py b/pubnub/enums.py index ee905505..645b68de 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -8,3 +8,48 @@ def string(cls, method): return "GET" elif method == cls.POST: return "POST" + + +class PNStatusCategory(object): + PNUnknownCategory = 1 + PNAcknowledgmentCategory = 2 + PNAccessDeniedCategory = 3 + PNTimeoutCategory = 4 + PNNetworkIssuesCategory = 5 + PNConnectedCategory = 6 + PNReconnectedCategory = 7 + PNDisconnectedCategory = 8 + PNUnexpectedDisconnectCategory = 9 + PNCancelledCategory = 10 + PNBadRequestCategory = 11 + PNMalformedFilterExpressionCategory = 12 + PNMalformedResponseCategory = 13 + PNDecryptionErrorCategory = 14 + PNTLSConnectionFailedCategory = 15 + PNTLSUntrustedCertificateCategory = 16 + + +class PNOperationType(object): + PNSubscribeOperation = 1, + PNUnsubscribeOperation = 2, + PNPublishOperation = 3, + PNHistoryOperation = 4, + PNWhereNowOperation = 5, + + PNHeartbeatOperation = 6, + PNSetStateOperation = 7, + PNAddChannelsToGroupOperation = 8, + PNRemoveChannelsFromGroupOperation = 9, + PNChannelGroupsOperation = 10, + PNRemoveGroupOperation = 11, + PNChannelsForGroupOperation = 12, + PNPushNotificationEnabledChannelsOperation = 13, + PNAddPushNotificationsOnChannelsOperation = 14, + PNRemovePushNotificationsFromChannelsOperation = 15, + PNRemoveAllPushNotificationsOperation = 16, + PNTimeOperation = 17, + + PNHereNowOperation = 18, + PNGetState = 19, + PNAccessManagerAudit = 20, + PNAccessManagerGrant = 21 diff --git a/pubnub/errors.py b/pubnub/errors.py index f3e921eb..e40b18ad 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -17,3 +17,4 @@ PNERR_DEFERRED_NOT_IMPLEMENTED = "Deferred endpoint call is not implemented by this platform" PNERR_JSON_DECODING_FAILED = "JSON decoding failed" PNERR_JSON_NOT_SERIALIZABLE = "Trying to publish not JSON serializable object" +PNERR_CHANNEL_OR_GROUP_MISSING = "Channel or group missing" diff --git a/pubnub/managers.py b/pubnub/managers.py new file mode 100644 index 00000000..ad343691 --- /dev/null +++ b/pubnub/managers.py @@ -0,0 +1,211 @@ +import threading +from Queue import Queue + +from .dtos import SubscribeOperation +from .models.server.subscribe import SubscribeEnvelope +from .enums import PNStatusCategory +from .callbacks import SubscribeCallback +from .models.subscription_item import SubscriptionItem +from .endpoints.pubsub.subscribe import Subscribe +from .workers import SubscribeMessageWorker +from .utils import synchronized +from .models.consumer.common import PNStatus + + +class PublishSequenceManager(object): + def __init__(self, provided_max_sequence): + self.max_sequence = provided_max_sequence + self.next_sequence = 0 + + # TODO: should be thread-safe + def get_next_sequence(self): + if self.max_sequence == self.next_sequence: + self.next_sequence = 1 + else: + self.next_sequence += 1 + + return self.next_sequence + + +class StateManager(object): + def __init__(self): + self._channels = {} + self._groups = {} + self._presence_channels = {} + self._presence_groups = {} + + def prepare_channel_list(self, include_presence): + return StateManager._prepare_membership_list( + self._channels, self._presence_channels, include_presence) + + def prepare_channel_group_list(self, include_presence): + return StateManager._prepare_membership_list( + self._channels, self._presence_channels, include_presence) + + def adapt_subscribe_builder(self, subscribe_operation): + for channel in subscribe_operation.channels: + self._channels[channel] = SubscriptionItem(name=channel) + + if subscribe_operation.presence_enabled: + self._presence_channels[channel] = SubscriptionItem(name=channel) + + for group in subscribe_operation.channel_groups: + self._groups[group] = SubscriptionItem(name=group) + + if subscribe_operation.presence_enabled: + self._presence_groups[group] = SubscriptionItem(name=group) + + @staticmethod + def _prepare_membership_list(data_storage, presence_storage, include_presence): + response = [] + + for item in data_storage.values(): + response.append(item.name) + + if include_presence: + for item in presence_storage.values(): + response.append(item.name + "-pnpres") + + return response + + +class ListenerManager(object): + def __init__(self, pubnub_instance): + self._pubnub = pubnub_instance + self._listeners = [] + + def add_listener(self, listener): + assert isinstance(listener, SubscribeCallback) + self._listeners.append(listener) + + def remove_listener(self, listener): + assert isinstance(listener, SubscribeCallback) + self._listeners.remove(listener) + + def announce_status(self, status): + for callback in self._listeners: + callback.status(self._pubnub, status) + + def announce_message(self, message): + for callback in self._listeners: + callback.message(self._pubnub, message) + + def announce_presence(self, presence): + for callback in self._listeners: + callback.presence(self._pubnub, presence) + + +class SubscriptionManager(object): + def __init__(self, pubnub_instance): + self._pubnub = pubnub_instance + self._subscription_status_announced = False + # TODO: ensure this is a correct Queue + self._message_queue = Queue() + self._subscription_state = StateManager() + self._listener_manager = ListenerManager(self._pubnub) + self._timetoken = 0 + self._region = None + + self._should_stop = False + + self._subscribe_call = None + self._heartbeat_call = None + + self._consumer_event = threading.Event() + consumer = SubscribeMessageWorker(self._pubnub, self._listener_manager, + self._message_queue, self._consumer_event) + self._consumer_thread = threading.Thread(target=consumer.run, + name="SubscribeMessageWorker") + self._consumer_thread.start() + + def add_listener(self, listener): + self._listener_manager.add_listener(listener) + + @synchronized + def adapt_subscribe_builder(self, subscribe_operation): + assert isinstance(subscribe_operation, SubscribeOperation) + self._subscription_state.adapt_subscribe_builder(subscribe_operation) + self._subscription_status_announced = False + + if subscribe_operation.timetoken is not None: + self._timetoken = subscribe_operation.timetoken + + self.reconnect() + + @synchronized + def reconnect(self): + self._should_stop = False + self._start_subscribe_loop() + self._register_heartbeat_timer() + + def stop(self): + # self._stop_heartbeat_timer() + self._stop_subscribe_loop() + self._should_stop = True + self._consumer_event.set() + + def _start_subscribe_loop(self): + self._stop_subscribe_loop() + + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) + + if len(combined_channels) == 0 and len(combined_groups) == 0: + return + + def callback(raw_result, status): + """ SubscribeEndpoint callback""" + assert isinstance(status, PNStatus) + + if status.is_error(): + if status.category is PNStatusCategory.PNTimeoutCategory and not self._should_stop: + self._start_subscribe_loop() + else: + self._listener_manager.announce_status(status) + + return + + if not self._subscription_status_announced: + pn_status = PNStatus() + pn_status.category = PNStatusCategory.PNConnectedCategory, + pn_status.status_code = status.status_code + pn_status.auth_key = status.auth_key + pn_status.operation = status.operation + pn_status.client_request = status.client_request + pn_status.origin = status.origin + pn_status.tls_enabled = status.tls_enabled + + self._subscription_status_announced = True + self._listener_manager.announce_status(pn_status) + + result = SubscribeEnvelope.from_json(raw_result) + if result.messages is not None and len(result.messages) > 0: + for message in result.messages: + self._message_queue.put(message) + + self._timetoken = long(result.metadata.timetoken) + self._region = int(result.metadata.region) + self._start_subscribe_loop() + + try: + self._subscribe_call = Subscribe(self._pubnub) \ + .channels(combined_channels).groups(combined_groups) \ + .timetoken(self._timetoken).region(self._region) \ + .filter_expression(self._pubnub.config.filter_expression) \ + .async(callback) + except Exception as e: + print("failed", e) + + def _stop_subscribe_loop(self): + sc = self._subscribe_call + + if sc is not None and not sc.is_executed and not sc.is_canceled: + sc.cancel() + + # TODO: implement + def _stop_heartbeat_timer(self): + pass + + # TODO: implement + def _register_heartbeat_timer(self): + pass diff --git a/pubnub/managers/publish_sequence_manager.py b/pubnub/managers/publish_sequence_manager.py deleted file mode 100644 index 43c5a445..00000000 --- a/pubnub/managers/publish_sequence_manager.py +++ /dev/null @@ -1,13 +0,0 @@ -class PublishSequenceManager: - def __init__(self, provided_max_sequence): - self.max_sequence = provided_max_sequence - self.next_sequence = 0 - - # TODO: should be thread-safe - def get_next_sequence(self): - if self.max_sequence == self.next_sequence: - self.next_sequence = 1 - else: - self.next_sequence += 1 - - return self.next_sequence diff --git a/pubnub/models/consumer/common.py b/pubnub/models/consumer/common.py new file mode 100644 index 00000000..38bf1123 --- /dev/null +++ b/pubnub/models/consumer/common.py @@ -0,0 +1,21 @@ +class PNStatus: + def __init__(self): + self.category = None + self.error_data = None + self.error = None + + self.status_code = None + self.operation = None + + self.tls_enabled = None + + self.uuid = None + self.auth_key = None + self.origin = None + self.client_request = None + + self.affected_channels = None + self.affected_groups = None + + def is_error(self): + return self.error diff --git a/pubnub/models/consumer/pn_error_data.py b/pubnub/models/consumer/pn_error_data.py new file mode 100644 index 00000000..e7946d1d --- /dev/null +++ b/pubnub/models/consumer/pn_error_data.py @@ -0,0 +1,7 @@ +class PNErrorData(): + def __init__(self, information, exception): + assert isinstance(information, str) + assert isinstance(exception, Exception) + + self.information = information + self.exception = exception diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index 88b3e4f0..f1a33f2a 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -1,3 +1,44 @@ +class PNMessageResult(object): + def __init__(self, message, subscribed_channel, actual_channel, timetoken, user_metadata=None): + assert message is not None + assert isinstance(subscribed_channel, (str, unicode)) + assert isinstance(actual_channel, (str, unicode)) + assert isinstance(timetoken, long) + + if user_metadata is not None: + assert isinstance(user_metadata, object) + + self.message = message + self.subscribed_channel = subscribed_channel + self.actual_channel = actual_channel + self.timetoken = timetoken + self.user_metadata = user_metadata + + +class PNPresenceEventResult(object): + def __init__(self, event, uuid, timestamp, occupancy, subscribed_channel, actual_channel, + timetoken, user_metadata=None): + + assert isinstance(event, str) + assert isinstance(uuid, str) + assert isinstance(timestamp, long) + assert isinstance(occupancy, int) + assert isinstance(actual_channel, str) + assert isinstance(timetoken, long) + + if user_metadata is not None: + assert isinstance(user_metadata, object) + + self.event = event + self.uuid = uuid + self.timestamp = timestamp + self.occupancy = occupancy + self.subscribed_channel = subscribed_channel + self.actual_channel = actual_channel + self.timetoken = timetoken + self.user_metadata = user_metadata + + class PNPublishResult(object): def __init__(self, envelope, timetoken): """ diff --git a/pubnub/managers/__init__.py b/pubnub/models/server/__init__.py similarity index 100% rename from pubnub/managers/__init__.py rename to pubnub/models/server/__init__.py diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py new file mode 100644 index 00000000..2841641d --- /dev/null +++ b/pubnub/models/server/subscribe.py @@ -0,0 +1,92 @@ +class SubscribeEnvelope: + def __init__(self, messages=None, metadata=None): + assert isinstance(messages, (list, None)) + assert isinstance(metadata, (SubscribeMetadata, None)) + + self.messages = messages + self.metadata = metadata + + @classmethod + def from_json(cls, json_input): + messages = [] + if json_input is None: + print("blah") + for raw_message in json_input['m']: + messages.append(SubscribeMessage.from_json(raw_message)) + + metadata = SubscribeMetadata.from_json(json_input['t']) + return SubscribeEnvelope(messages, metadata) + + +class SubscribeMessage: + def __init__(self): + self.shard = None + self.subscription_match = None + self.channel = None + self.payload = None + self.flags = None + self.issuing_client_id = None + self.subscribe_key = None + self.origination_timetoken = None + self.publish_metadata = None + + @classmethod + def from_json(cls, json_input): + message = SubscribeMessage() + message.shard = json_input['a'] + message.subscription_match = json_input['b'] + message.channel = json_input['c'] + message.payload = json_input['d'] + message.flags = json_input['f'] + message.issuing_client_id = json_input['i'] + message.subscribe_key = json_input['k'] + if 'o' in json_input: + message.origination_timetoken = json_input['o'] + message.publish_metadata = PublishMetadata.from_json(json_input['p']) + + return message + + +class SubscribeMetadata: + def __init__(self, timetoken=None, region=None): + self.timetoken = timetoken + self.region = region + + @classmethod + def from_json(cls, json_input): + assert isinstance(json_input, dict) + assert 'r' in json_input + assert 't' in json_input + + return SubscribeMetadata(json_input['t'], json_input['r']) + + +class PresenceEnvelope: + def __init__(self, action, uuid, occupancy, timestamp): + assert isinstance(action, str) + assert isinstance(uuid, str) + assert isinstance(occupancy, int) + assert isinstance(timestamp, long) + + self.action = action + self.uuid = uuid + self.occupancy = occupancy + self.timestamp = timestamp + + @classmethod + def from_json_payload(cls, json): + return False + + +# TODO: refactor this file to server.py +class PublishMetadata: + def __init__(self, publish_timetoken=None, region=None): + self.publish_timetoken = publish_timetoken + self.region = region + + @classmethod + def from_json(cls, json_input): + assert 'r' in json_input + assert 't' in json_input + + return PublishMetadata(long(json_input['t']), int(json_input['r'])) diff --git a/pubnub/models/subscription_item.py b/pubnub/models/subscription_item.py new file mode 100644 index 00000000..11ff2db3 --- /dev/null +++ b/pubnub/models/subscription_item.py @@ -0,0 +1,4 @@ +class SubscriptionItem(object): + def __init__(self, name=None, object=None): + self.name = name + self.object = object diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index a2c5d9e0..2059de67 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -15,6 +15,8 @@ def __init__(self): self.publish_key = None self.cipher_key = None self.auth_key = None + self.filter_expression = None + self.enable_subscribe = True def validate(self): assert self.uuid is None or isinstance(self.uuid, str) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 1608a7cd..4662804e 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,69 +1,259 @@ import logging import threading +import requests -from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED, PNERR_UNKNOWN_ERROR +from .pnconfiguration import PNConfiguration +from .builders import SubscribeBuilder +from .managers import SubscriptionManager +from . import utils +from .structures import RequestOptions, ResponseInfo +from .enums import PNStatusCategory +from .callbacks import SubscribeCallback +from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED, PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, \ + PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR from .exceptions import PubNubException - -from .pubnub_core import PubNubCore, pn_request +from .pubnub_core import PubNubCore logger = logging.getLogger("pubnub") class PubNub(PubNubCore): """PubNub Python API""" + ENTITY_THREAD_COUNTER = 0 def __init__(self, config): + assert isinstance(config, PNConfiguration) PubNubCore.__init__(self, config) + if self.config.enable_subscribe: + self._subscription_manager = SubscriptionManager(self) + + def subscribe(self): + return SubscribeBuilder(self._subscription_manager) + def sdk_platform(self): return "" - def request_async(self, options, success, error): - client = AsyncHTTPClient(self, options, success, error) + def request_sync(self, options): + res = self.pn_request(self.session, self.config.scheme_and_host(), self.headers, options, + self.config.connect_timeout, self.config.non_subscribe_request_timeout) + + # http error + if res.status_code != requests.codes.ok: + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + raise PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ) + + return res + + def request_async(self, endpoint_name, options, callback, cancellation_event): + call = Call() + + def success_callback(res): + # http error + status_category = PNStatusCategory.PNUnknownCategory + response_info = None + + if res is not None: + url = utils.urlparse(res.url) + query = utils.parse_qs(url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=res.status_code, + tls_enabled='https' == url.scheme, + origin=url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=res.request + ) - thread = threading.Thread(target=client.run) + if res.status_code != requests.codes.ok: + if res.status_code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if res.status_code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + callback(status_category, res.json(), response_info, PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + )) + call.executed_cb() + else: + callback(status_category, res.json(), response_info, None) + call.executed_cb() + + def error_callback(e): + status_category = PNStatusCategory.PNBadRequestCategory + # TODO: allow non PN errors + + if not type(e) is PubNubException: + raise e + + if e._pn_error is PNERR_CONNECTION_ERROR: + status_category = PNStatusCategory.PNUnexpectedDisconnectCategory + elif e._pn_error is PNERR_CLIENT_TIMEOUT: + status_category = PNStatusCategory.PNTimeoutCategory + + callback(status_category, None, None, e) + call.executed_cb() + + client = AsyncHTTPClient(self, success_callback, error_callback, options, cancellation_event) + + thread = threading.Thread( + target=client.run, + name="%sEndpointThread-%d" % (endpoint_name, ++PubNub.ENTITY_THREAD_COUNTER) + ) + thread.setDaemon(True) thread.start() - return thread + call.thread = thread + call.cancellation_event = cancellation_event + + return call - def async_error_to_return(self, e, errback): - errback(e) - return FakeThread() + def stop(self): + self._subscription_manager.stop() def request_deferred(self, options_func): raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) + def add_listener(self, listener): + assert isinstance(listener, SubscribeCallback) + self._subscription_manager.add_listener(listener) + + def pn_request(self, session, scheme_and_host, headers, options, connect_timeout, read_timeout): + assert isinstance(options, RequestOptions) + url = scheme_and_host + options.path + + args = { + "method": options.method_string, + 'headers': headers, + "url": url, + 'params': options.query_string, + 'timeout': (connect_timeout, read_timeout) + } + + if options.is_post(): + args['data'] = options.data + logger.debug("%s %s %s %s" % (options.method_string, url, options.params, options.data)) + else: + logger.debug("%s %s %s" % (options.method_string, url, options.params)) + + # connection error + try: + res = session.request(**args) + logger.debug("GOT %s" % res.text) + except requests.exceptions.ConnectionError as e: + raise PubNubException( + pn_error=PNERR_CONNECTION_ERROR, + errormsg=str(e) + ) + except requests.exceptions.HTTPError as e: + raise PubNubException( + pn_error=PNERR_HTTP_ERROR, + errormsg=str(e) + ) + except requests.exceptions.Timeout as e: + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + except requests.exceptions.TooManyRedirects as e: + raise PubNubException( + pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, + errormsg=str(e) + ) + except Exception as e: + raise PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg=str(e) + ) + + return res + class AsyncHTTPClient: """A wrapper for threaded calls""" - def __init__(self, pubnub, options, callback=None, error=None, id=None): - # TODO: introduce timeouts + def __init__(self, pubnub, success, error, options, cancellation_event): self.options = options - self.id = id - self.success = callback + self.success = success self.error = error self.pubnub = pubnub - - def cancel(self): - self.success = None - self.error = None + self.cancellation_event = cancellation_event def run(self): try: - res = pn_request(self.pubnub.session, self.pubnub.config.scheme_and_host(), self.pubnub.headers, - self.options, self.pubnub.config.connect_timeout, - self.pubnub.config.non_subscribe_request_timeout) + res = self.pubnub.pn_request( + self.pubnub.session, self.pubnub.config.scheme_and_host(), + self.pubnub.headers, self.options, + self.pubnub.config.connect_timeout, + self.pubnub.config.non_subscribe_request_timeout) + + if self.cancellation_event.isSet(): + # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call + return + self.success(res) except PubNubException as e: self.error(e) - except Exception as e: - self.error(PubNubException( - pn_error=PNERR_UNKNOWN_ERROR, - errormsg=str(e) - )) -class FakeThread: +class Call(object): + """ + A platform dependent representation of async PubNub method call + """ + def __init__(self): + self.thread = None + self.cancellation_event = None + self.is_executed = False + self.is_canceled = False + + def cancel(self): + """ + Set Event flag to stop thread on timeout. This will not stop thread immediately, it will stopped + only after ongoing request will be finished + :return: nothing + """ + self.cancellation_event.set() + self.is_canceled = True + def join(self): - pass + if isinstance(self.thread, threading.Thread): + self.thread.join() + + def executed_cb(self): + self.is_executed = True + diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index e7d3285f..e8c204c4 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -2,16 +2,10 @@ from abc import ABCMeta, abstractmethod import requests -from requests import ConnectionError -from requests.packages.urllib3.exceptions import HTTPError -from .managers.publish_sequence_manager import PublishSequenceManager +from .managers import PublishSequenceManager from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow -from .structures import RequestOptions -from .exceptions import PubNubException -from .errors import PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, \ - PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR logger = logging.getLogger("pubnub") @@ -38,22 +32,10 @@ def __init__(self, config): self.publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) - def request_sync(self, options): - return pn_request(self.session, self.config.scheme_and_host(), self.headers, options, - self.config.connect_timeout, self.config.non_subscribe_request_timeout) - - @abstractmethod - def request_async(self, options, success, error): - pass - @abstractmethod def request_deferred(self, options_func): pass - @abstractmethod - def async_error_to_return(self, e, errback): - pass - def here_now(self): return HereNow(self) @@ -70,70 +52,3 @@ def sdk_platform(self): pass @property def uuid(self): return self.config.uuid - - -def pn_request(session, scheme_and_host, headers, options, connect_timeout, read_timeout): - assert isinstance(options, RequestOptions) - url = scheme_and_host + options.path - - args = { - "method": options.method_string, - 'headers': headers, - "url": url, - 'params': options.query_string, - 'timeout': (connect_timeout, read_timeout) - } - - if options.is_post(): - args['data'] = options.data - logger.debug("%s %s %s %s" % (options.method_string, url, options.params, options.data)) - else: - logger.debug("%s %s %s" % (options.method_string, url, options.params)) - - # connection error - try: - res = session.request(**args) - except ConnectionError as e: - raise PubNubException( - pn_error=PNERR_CONNECTION_ERROR, - errormsg=str(e) - ) - except HTTPError as e: - raise PubNubException( - pn_error=PNERR_HTTP_ERROR, - errormsg=str(e) - ) - except requests.exceptions.Timeout as e: - raise PubNubException( - pn_error=PNERR_CLIENT_TIMEOUT, - errormsg=str(e) - ) - except requests.exceptions.TooManyRedirects as e: - raise PubNubException( - pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, - errormsg=str(e) - ) - except Exception as e: - raise PubNubException( - pn_error=PNERR_UNKNOWN_ERROR, - errormsg=str(e) - ) - - # http error - if res.status_code != requests.codes.ok: - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - raise PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - ) - - return res.json() diff --git a/pubnub/structures.py b/pubnub/structures.py index 0d6cf0a6..25267b12 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -34,10 +34,20 @@ def query_list(self, do_not_encode=None): for k, v in self.params.items(): if k in do_not_encode: continue - s.append(e(k) + "=" + e(v)) + s.append(e(str(k)) + "=" + e(str(v))) return s @property def query_string(self): return str('&'.join(self.query_list())) + + +class ResponseInfo(object): + def __init__(self, status_code, tls_enabled, origin, uuid, auth_key, client_request): + self.status_code = status_code + self.tls_enabled = tls_enabled + self.origin = origin + self.uuid = uuid + self.auth_key = auth_key + self.client_request = client_request diff --git a/pubnub/utils.py b/pubnub/utils.py index e48892ae..f59fccda 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,5 +1,6 @@ import json import uuid as u +import threading from .errors import PNERR_JSON_NOT_SERIALIZABLE from .exceptions import PubNubException @@ -9,11 +10,21 @@ except ImportError: from urlparse import urlunsplit as pn_urlunsplit +try: + from urllib.parse import urlparse as pn_urlparse +except ImportError: + from urlparse import urlparse as pn_urlparse + try: from urllib.parse import urlencode as pn_urlencode except ImportError: from urllib import urlencode as pn_urlencode +try: + from urllib.parse import parse_qs as pn_parse_qs +except ImportError: + from urlparse import parse_qs as pn_parse_qs + def get_data_for_user(data): try: @@ -43,12 +54,41 @@ def url_encode(data): except ImportError: from urllib import quote as q - return q(data) + try: + r = q(data) + except Exception as e: + print(e) + + return r def uuid(): return str(u.uuid4()) +def split_items(items_string): + if len(items_string) is 0: + return [] + else: + return items_string.split(",") + + +def join_items(items_list): + return ",".join(items_list) + + def build_url(scheme, origin, path, params): return pn_urlunsplit((scheme, origin, path, params, '')) + + +def synchronized(func): + func.__lock__ = threading.Lock() + + def synced_func(*args, **kws): + with func.__lock__: + return func(*args, **kws) + + return synced_func + +urlparse = pn_urlparse +parse_qs = pn_parse_qs diff --git a/pubnub/workers.py b/pubnub/workers.py new file mode 100644 index 00000000..3759e248 --- /dev/null +++ b/pubnub/workers.py @@ -0,0 +1,80 @@ +import logging +from Queue import Queue, Empty + + +from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult +from .models.server.subscribe import SubscribeMessage, PresenceEnvelope +# from .pubnub_core import PubNubCore +# from .managers import ListenerManager + +logger = logging.getLogger("pubnub") + + +class SubscribeMessageWorker(object): + def __init__(self, pubnub_instnace, listener_manager_instance, queue_instance, event): + # assert isinstance(pubnub_instnace, PubNubCore) + # assert isinstance(listener_manager_instance, ListenerManager) + assert isinstance(queue_instance, Queue) + + self._pubnub = pubnub_instnace + self._listener_manager = listener_manager_instance + self._queue = queue_instance + self._is_running = None + self._event = event + + def run(self): + self._take_message() + + def _take_message(self): + while not self._event.isSet(): + try: + # TODO: get rid of 1s timeout + msg = self._queue.get(True, 1) + if msg is not None: + self._process_incoming_payload(msg) + self._queue.task_done() + except Empty: + continue + except Exception as e: + self._queue.task_done() + self._event.set() + logger.warn("take message interrupted: %s" % str(e)) + + def _process_message(self, message_input): + if self._pubnub.config.cipher_key is None: + return message_input + else: + return "TODO: implement cipher decoding" + + def _process_incoming_payload(self, message): + assert isinstance(message, SubscribeMessage) + + channel = message.channel + subscription_match = message.subscription_match + publish_meta_data = message.publish_metadata + + if "-pnpres" in message.channel: + presence_payload = PresenceEnvelope.from_json_payload(message.payload) + pn_presence_event_result = PNPresenceEventResult( + event=presence_payload.action, + actual_channel=(channel if subscription_match is not None else None), + subscribed_channel=(subscription_match if subscription_match is not None else channel), + timetoken=publish_meta_data.publish_timetoken, + occupancy=presence_payload.occupancy, + uuid=presence_payload.uuid, + timestamp=presence_payload.timestamp + ) + self._listener_manager.announce_presence(pn_presence_event_result) + else: + extracted_message = self._process_message(message.payload) + + if extracted_message is None: + logger.debug("unable to parse payload on #processIncomingMessages") + + pn_message_result = PNMessageResult( + message=extracted_message, + actual_channel=(channel if subscription_match is not None else None), + subscribed_channel=(subscription_match if subscription_match is not None else channel), + timetoken=publish_meta_data.publish_timetoken + ) + self._listener_manager.announce_message(pn_message_result) diff --git a/tests/functional/test_subscribe.py b/tests/functional/test_subscribe.py new file mode 100644 index 00000000..a5326ea0 --- /dev/null +++ b/tests/functional/test_subscribe.py @@ -0,0 +1,132 @@ +import unittest + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.endpoints.pubsub.subscribe import Subscribe +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestSubscribe(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name + ) + self.pubnub.uuid = "UUID_SubscribeUnitTest" + self.sub = Subscribe(self.pubnub) + + def test_pub_single_channel(self): + self.sub.channels('ch') + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, 'ch')) + + self.assertEqual(self.sub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._channels, ['ch']) + + def test_sub_multiple_channels_using_string(self): + self.sub.channels("ch1,ch2,ch3") + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.sub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._channels, ['ch1', 'ch2', 'ch3']) + + def test_sub_multiple_channels_using_list(self): + self.sub.channels(['ch1', 'ch2', 'ch3']) + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.sub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._channels, ['ch1', 'ch2', 'ch3']) + + def test_sub_multiple_channels_using_tuple(self): + self.sub.channels(('ch1', 'ch2', 'ch3')) + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.sub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._channels, ['ch1', 'ch2', 'ch3']) + + def test_sub_single_group(self): + self.sub.groups("gr") + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.sub.build_params(), { + 'channel-group': 'gr', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._groups, ['gr']) + + def test_sub_multiple_groups_using_string(self): + self.sub.groups("gr1,gr2,gr3") + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.sub.build_params(), { + 'channel-group': 'gr1,gr2,gr3', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._groups, ['gr1', 'gr2', 'gr3']) + + def test_sub_multiple_groups_using_list(self): + self.sub.groups(['gr1', 'gr2', 'gr3']) + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.sub.build_params(), { + 'channel-group': 'gr1,gr2,gr3', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.sub._groups, ['gr1', 'gr2', 'gr3']) + + def test_sub_multiple(self): + self.sub.channels('ch1,ch2').filter_expression('blah').region('us-east-1').timetoken('123') + + self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH + % (pnconf.subscribe_key, "ch1,ch2")) + + self.assertEqual(self.sub.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'filter-expr': 'blah', + 'tr': 'us-east-1', + 'tt': '123' + }) + + self.assertEqual(self.sub._groups, []) + self.assertEqual(self.sub._channels, ['ch1', 'ch2']) diff --git a/tests/helper.py b/tests/helper.py index 1b6d9423..b853ffe8 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,3 +1,5 @@ +import threading + from pubnub import utils from pubnub.pnconfiguration import PNConfiguration @@ -16,3 +18,41 @@ def url_encode(data): return utils.url_encode(utils.write_value_as_string(data)) + + +class CountDownLatch(object): + def __init__(self, count=1): + self.count = count + self.lock = threading.Condition() + self.done = False + self.t = None + + def count_down(self): + self.lock.acquire() + self.count -= 1 + + if self.count <= 0: + self.done = True + self.lock.notifyAll() + + if self.t is not None: + self.t.cancel() + self.lock.release() + + def _release(self): + self.lock.acquire() + self.count = 0 + self.lock.notifyAll() + self.lock.release() + + def await(self, timeout=5): + self.lock.acquire() + + self.t = threading.Timer(timeout, self._release) + self.t.start() + + while self.count > 0: + self.lock.wait() + + self.t.cancel() + self.lock.release() diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index 565671b7..cbdfa1c3 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -1,9 +1,9 @@ import logging import threading - -import vcr import unittest +import time + import pubnub from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult @@ -11,6 +11,7 @@ from pubnub.pubnub import PubNub from tests.helper import pnconf, pnconf_enc +# import pydevd as pydevd pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -274,27 +275,36 @@ def test_publish_do_not_store(self): class TestPubNubAsyncSuccessPublish(unittest.TestCase): - def success(self, res): - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + def setUp(self): + self.event = threading.Event() + + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() - def error(self, e): - self.fail(e) + def assert_success(self): + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNPublishResult) + assert self.response.timetoken > 1 def assert_success_publish_get(self, msg): PubNub(pnconf).publish() \ .channel("ch1") \ .message(msg) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() def assert_success_publish_post(self, msg): PubNub(pnconf).publish() \ .channel("ch1") \ .message(msg) \ .use_post(True) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() def test_publish_get(self): self.assert_success_publish_get("hi") @@ -311,34 +321,41 @@ def test_publish_post(self): self.assert_success_publish_post({"name": "Alex", "online": True}) def test_publish_encrypted_list_get(self): - PubNub(pnconf_enc).publish() \ + pubnub = PubNub(pnconf_enc) + + pubnub.publish() \ .channel("ch1") \ .message(["encrypted", "list"]) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() + pubnub.stop() def test_publish_encrypted_string_get(self): PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("encrypted string") \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() def test_publish_encrypted_list_post(self): PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message(["encrypted", "list"]) \ .use_post(True) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() def test_publish_encrypted_string_post(self): PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("encrypted string") \ .use_post(True) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() def test_publish_with_meta(self): meta = {'a': 2, 'b': 'qwer'} @@ -347,29 +364,30 @@ def test_publish_with_meta(self): .channel("ch1") \ .message("hey") \ .meta(meta) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + + self.assert_success() def test_publish_do_not_store(self): PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("hey") \ .should_store(False) \ - .async(self.success, self.error) \ - .join() + .async(self.callback) + self.assert_success() -class TestPubNubAsyncErrorPublish(unittest.TestCase): - def success(self, res): - self.invalid_key_message = "Success callback invoked: " + str(res) - def error_invalid_key(self): - def handler(ex): - self.invalid_key_message = str(ex) +class TestPubNubAsyncErrorPublish(unittest.TestCase): + def setUp(self): + self.event = threading.Event() - return handler + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() - def test_invalid_key(self): + def test_invalid_k(self): self.invalid_key_message = "" config = PNConfiguration() config.publish_key = "fake" @@ -378,37 +396,37 @@ def test_invalid_key(self): PubNub(config).publish() \ .channel("ch1") \ .message("hey") \ - .async(self.success, self.error_invalid_key()) \ - .join() + .async(self.callback) - assert "HTTP Client Error (400):" in self.invalid_key_message - assert "Invalid Key" in self.invalid_key_message + self.event.wait() - def error_missing_message(self, err): - assert "Message missing" in str(err) - pass + assert self.status.is_error() + assert self.response.envelope[0] is 0 + assert self.response.envelope[1] == 'Invalid Key' + assert "HTTP Client Error (400):" in str(self.status.error_data.exception) + assert "Invalid Key" in str(self.status.error_data.exception) def test_missing_message(self): PubNub(pnconf).publish() \ .channel("ch1") \ .message(None) \ - .async(self.success, self.error_missing_message) \ - .join() + .async(self.callback) + + self.event.wait() - def error_missing_channel(self, err): - assert "Channel missing" in str(err) - pass + assert self.status.is_error() + assert self.response is None + assert "Message missing" in str(self.status.error_data.exception) def test_missing_chanel(self): PubNub(pnconf).publish() \ .channel("") \ .message("hey") \ - .async(self.success, self.error_missing_channel) \ - .join() + .async(self.callback) - def error_non_serializable(self, err): - assert "not JSON serializable" in str(err) - pass + assert self.status.is_error() + assert self.response is None + assert "Channel missing" in str(self.status.error_data.exception) def test_non_serializable(self): def method(): @@ -417,5 +435,10 @@ def method(): PubNub(pnconf).publish() \ .channel("ch1") \ .message(method) \ - .async(self.success, self.error_non_serializable) \ - .join() + .async(self.callback) + + self.event.wait() + + assert self.status.is_error() + assert self.response is None + assert "not JSON serializable" in str(self.status.error_data.exception) diff --git a/tests/integrational/native/test_subscribe.py b/tests/integrational/native/test_subscribe.py new file mode 100644 index 00000000..6e77d27b --- /dev/null +++ b/tests/integrational/native/test_subscribe.py @@ -0,0 +1,59 @@ +import logging +import unittest + +# import pydevd as pydevd + +import pubnub +from pubnub.callbacks import SubscribeCallback +from pubnub.exceptions import PubNubException +from pubnub.pubnub import PubNub +from tests.helper import pnconf, CountDownLatch + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubSubscribe(unittest.TestCase): + # @vcr.use_cassette('integrational/fixtures/publish/publish_string_get.yaml', + # filter_query_parameters=['uuid']) + def test_subscribe_latched(self): + pubnub = PubNub(pnconf) + latch = CountDownLatch() + + class MyCallback(SubscribeCallback): + def __init__(self, l): + super(MyCallback, self).__init__() + + assert isinstance(l, CountDownLatch) + self._latch = l + self.done = False + self.msg = None + + def status(self, p, status): + p.publish().channel('ch1').message('hey').sync() + + def presence(self, p, presence): + pass + + def message(self, p, message): + self.done = True + self.msg = message + self._latch.count_down() + + try: + callback = MyCallback(latch) + pubnub.add_listener(callback) + pubnub.subscribe() \ + .channels(["ch1", "ch2"]) \ + .execute() + + latch.await(10) + + assert callback.done + assert callback.msg.actual_channel == 'ch1' + assert callback.msg.subscribed_channel == 'ch1' + assert callback.msg.message == 'hey' + assert callback.msg.timetoken > 0 + + pubnub.stop() + except PubNubException as e: + self.fail(e) From 3e7b56041cb6c3ce0bc09bba61b45539f18aec7d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 3 Jun 2016 07:28:57 -0700 Subject: [PATCH 094/468] Fix native integrational publish tests --- pubnub/endpoints/pubsub/publish.py | 3 +++ pubnub/utils.py | 7 +------ tests/helper.py | 22 ++++++++++++++++++---- tests/integrational/native/test_publish.py | 10 ++++------ 4 files changed, 26 insertions(+), 16 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index d4e80817..8f6e2e9e 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -111,6 +111,9 @@ def create_response(self, envelope): :param envelope: an already serialized json response :return: """ + if envelope is None: + return None + timetoken = int(envelope[2]) res = PNPublishResult(envelope, timetoken) diff --git a/pubnub/utils.py b/pubnub/utils.py index f59fccda..79c6b78a 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -54,12 +54,7 @@ def url_encode(data): except ImportError: from urllib import quote as q - try: - r = q(data) - except Exception as e: - print(e) - - return r + return q(data) def uuid(): diff --git a/tests/helper.py b/tests/helper.py index b853ffe8..01e5f055 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -4,14 +4,28 @@ from pubnub.pnconfiguration import PNConfiguration +pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" +sub_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" + pnconf = PNConfiguration() -pnconf.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" -pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconf.publish_key = pub_key +pnconf.subscribe_key = sub_key +pnconf.enable_subscribe = False + +pnconf_sub = PNConfiguration() +pnconf_sub.publish_key = pub_key +pnconf_sub.subscribe_key = sub_key pnconf_enc = PNConfiguration() -pnconf_enc.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" -pnconf_enc.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconf_enc.publish_key = pub_key +pnconf_enc.subscribe_key = sub_key pnconf_enc.cipher_key = "testKey" +pnconf_enc.enable_subscribe = False + +pnconf_enc_sub = PNConfiguration() +pnconf_enc_sub.publish_key = pub_key +pnconf_enc_sub.subscribe_key = sub_key +pnconf_enc_sub.cipher_key = "testKey" sdk_name = "Python-UnitTest" diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index cbdfa1c3..f6de8a26 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -1,17 +1,14 @@ import logging import threading import unittest - -import time - import pubnub + from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub from tests.helper import pnconf, pnconf_enc -# import pydevd as pydevd pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -198,6 +195,7 @@ def test_invalid_key(self): config = PNConfiguration() config.publish_key = "fake" config.subscribe_key = "demo" + config.enable_subscribe = False try: PubNub(config).publish() \ @@ -329,7 +327,6 @@ def test_publish_encrypted_list_get(self): .async(self.callback) self.assert_success() - pubnub.stop() def test_publish_encrypted_string_get(self): PubNub(pnconf_enc).publish() \ @@ -387,11 +384,12 @@ def callback(self, response, status): self.status = status self.event.set() - def test_invalid_k(self): + def test_invalid_key(self): self.invalid_key_message = "" config = PNConfiguration() config.publish_key = "fake" config.subscribe_key = "demo" + config.enable_subscribe = False PubNub(config).publish() \ .channel("ch1") \ From 500f2744f9dbaa5baba4e73aee5be4e4800254c0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 3 Jun 2016 07:37:37 -0700 Subject: [PATCH 095/468] Fix integrational herenow tests --- pubnub/endpoints/presence/herenow.py | 8 +++++++- tests/integrational/native/test_here_now.py | 20 ++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 1731b994..358764e1 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -1,5 +1,5 @@ from pubnub.endpoints.endpoint import Endpoint -from pubnub.enums import HttpMethod +from pubnub.enums import HttpMethod, PNOperationType from pubnub.models.consumer.presence import PNHereNowResult, PNOccupantsData, PNHereNowChannelData @@ -82,3 +82,9 @@ def parse_multiple_channel_response(self, envelope): res = PNHereNowResult(int(payload['total_channels']), int(payload['total_channels']), channels) return res + + def operation_type(self): + return PNOperationType.PNPublishOperation + + def name(self): + return "HereNow" diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native/test_here_now.py index 218c1e2e..b6a5ec1f 100644 --- a/tests/integrational/native/test_here_now.py +++ b/tests/integrational/native/test_here_now.py @@ -10,9 +10,7 @@ class TestPubNubSyncHereNow(unittest.TestCase): def test_success(self): - pubnub = PubNub(pnconf) - - res = pubnub.here_now() \ + res = PubNub(pnconf).here_now() \ .channels(["ch1", "ch2", "ch3", "demo"]) \ .include_state(False) \ .sync() @@ -22,20 +20,14 @@ def test_success(self): class TestPubNubAsyncHereNow(unittest.TestCase): def test_success(self): - pubnub = PubNub(pnconf) - - def success(res): - print("success") - print(res.total_occupancy) - - def error(err): - print("error") - print(err) + def callback(res, status): + print("response", res) + print("status", status) - thread = pubnub.here_now() \ + thread = PubNub(pnconf).here_now() \ .channels(["ch1", "ch2", "ch3", "demo"]) \ .include_state(False) \ - .async(success, error) + .async(callback) print("awaiting") thread.join() From ea68a2eed58b96deab11397cb42abba661b47fae Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 3 Jun 2016 08:37:23 -0700 Subject: [PATCH 096/468] Add compatibility fixes --- pubnub/builders.py | 2 +- pubnub/dtos.py | 5 ++++- pubnub/endpoints/pubsub/subscribe.py | 1 - pubnub/managers.py | 9 +++++---- pubnub/models/consumer/pubsub.py | 9 ++++++--- pubnub/models/server/subscribe.py | 7 +++++-- pubnub/utils.py | 11 +++++++++++ pubnub/workers.py | 7 +++---- tests/integrational/native/test_subscribe.py | 4 ++-- 9 files changed, 37 insertions(+), 18 deletions(-) diff --git a/pubnub/builders.py b/pubnub/builders.py index 81b36056..5037a959 100644 --- a/pubnub/builders.py +++ b/pubnub/builders.py @@ -28,7 +28,7 @@ class SubscribeBuilder(PubSubBuilder): def __init__(self, subscription_manager): super(SubscribeBuilder, self).__init__(subscription_manager) self._presence_enabled = False - self._timetoken = 0L + self._timetoken = 0 def with_presence(self): self._presence_enabled = True diff --git a/pubnub/dtos.py b/pubnub/dtos.py index 5c6f6cbd..9d4fb65b 100644 --- a/pubnub/dtos.py +++ b/pubnub/dtos.py @@ -1,9 +1,12 @@ +import six + + class SubscribeOperation(object): def __init__(self, channels=None, channel_groups=None, presence_enabled=None, timetoken=None): assert isinstance(channels, (list, tuple)) assert isinstance(channel_groups, (list, tuple)) assert isinstance(presence_enabled, bool) - assert isinstance(timetoken, long) + assert isinstance(timetoken, six.integer_types) self.channels = channels self.channel_groups = channel_groups diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index 6fcb75fd..8c790b4a 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -3,7 +3,6 @@ from pubnub.enums import HttpMethod, PNOperationType from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING from pubnub.exceptions import PubNubException -from pubnub.models.server.subscribe import SubscribeEnvelope, SubscribeMessage, SubscribeMetadata class Subscribe(Endpoint): diff --git a/pubnub/managers.py b/pubnub/managers.py index ad343691..48700ed5 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -1,6 +1,6 @@ import threading -from Queue import Queue +from . import utils from .dtos import SubscribeOperation from .models.server.subscribe import SubscribeEnvelope from .enums import PNStatusCategory @@ -100,10 +100,10 @@ def __init__(self, pubnub_instance): self._pubnub = pubnub_instance self._subscription_status_announced = False # TODO: ensure this is a correct Queue - self._message_queue = Queue() + self._message_queue = utils.Queue() self._subscription_state = StateManager() self._listener_manager = ListenerManager(self._pubnub) - self._timetoken = 0 + self._timetoken = int(0) self._region = None self._should_stop = False @@ -183,7 +183,8 @@ def callback(raw_result, status): for message in result.messages: self._message_queue.put(message) - self._timetoken = long(result.metadata.timetoken) + # REVIEW: is int compatible with long for Python 2 + self._timetoken = int(result.metadata.timetoken) self._region = int(result.metadata.region) self._start_subscribe_loop() diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index f1a33f2a..0801a182 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -1,9 +1,12 @@ +import six + + class PNMessageResult(object): def __init__(self, message, subscribed_channel, actual_channel, timetoken, user_metadata=None): assert message is not None - assert isinstance(subscribed_channel, (str, unicode)) - assert isinstance(actual_channel, (str, unicode)) - assert isinstance(timetoken, long) + assert isinstance(subscribed_channel, six.string_types) + assert isinstance(actual_channel, six.string_types) + assert isinstance(timetoken, six.integer_types) if user_metadata is not None: assert isinstance(user_metadata, object) diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 2841641d..269b8d3e 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -1,3 +1,6 @@ +import six + + class SubscribeEnvelope: def __init__(self, messages=None, metadata=None): assert isinstance(messages, (list, None)) @@ -66,7 +69,7 @@ def __init__(self, action, uuid, occupancy, timestamp): assert isinstance(action, str) assert isinstance(uuid, str) assert isinstance(occupancy, int) - assert isinstance(timestamp, long) + assert isinstance(timestamp, six.integer_types) self.action = action self.uuid = uuid @@ -89,4 +92,4 @@ def from_json(cls, json_input): assert 'r' in json_input assert 't' in json_input - return PublishMetadata(long(json_input['t']), int(json_input['r'])) + return PublishMetadata(int(json_input['t']), int(json_input['r'])) diff --git a/pubnub/utils.py b/pubnub/utils.py index 79c6b78a..bb57da10 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -25,6 +25,16 @@ except ImportError: from urlparse import parse_qs as pn_parse_qs +try: + from queue import Queue as Queue +except ImportError: + from Queue import Queue as Queue + +try: + from queue import Empty as QueueEmpty +except ImportError: + from Queue import Empty as QueueEmpty + def get_data_for_user(data): try: @@ -87,3 +97,4 @@ def synced_func(*args, **kws): urlparse = pn_urlparse parse_qs = pn_parse_qs + diff --git a/pubnub/workers.py b/pubnub/workers.py index 3759e248..030ad277 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -1,7 +1,6 @@ import logging -from Queue import Queue, Empty - +from . import utils from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult from .models.server.subscribe import SubscribeMessage, PresenceEnvelope # from .pubnub_core import PubNubCore @@ -14,7 +13,7 @@ class SubscribeMessageWorker(object): def __init__(self, pubnub_instnace, listener_manager_instance, queue_instance, event): # assert isinstance(pubnub_instnace, PubNubCore) # assert isinstance(listener_manager_instance, ListenerManager) - assert isinstance(queue_instance, Queue) + assert isinstance(queue_instance, utils.Queue) self._pubnub = pubnub_instnace self._listener_manager = listener_manager_instance @@ -33,7 +32,7 @@ def _take_message(self): if msg is not None: self._process_incoming_payload(msg) self._queue.task_done() - except Empty: + except utils.QueueEmpty: continue except Exception as e: self._queue.task_done() diff --git a/tests/integrational/native/test_subscribe.py b/tests/integrational/native/test_subscribe.py index 6e77d27b..25ccb5a7 100644 --- a/tests/integrational/native/test_subscribe.py +++ b/tests/integrational/native/test_subscribe.py @@ -7,7 +7,7 @@ from pubnub.callbacks import SubscribeCallback from pubnub.exceptions import PubNubException from pubnub.pubnub import PubNub -from tests.helper import pnconf, CountDownLatch +from tests.helper import CountDownLatch, pnconf_sub pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -16,7 +16,7 @@ class TestPubNubSubscribe(unittest.TestCase): # @vcr.use_cassette('integrational/fixtures/publish/publish_string_get.yaml', # filter_query_parameters=['uuid']) def test_subscribe_latched(self): - pubnub = PubNub(pnconf) + pubnub = PubNub(pnconf_sub) latch = CountDownLatch() class MyCallback(SubscribeCallback): From 0361eddc54c2698aacf3658ce04f868b1b25a06d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 3 Jun 2016 08:40:09 -0700 Subject: [PATCH 097/468] Add todo comment --- pubnub/utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pubnub/utils.py b/pubnub/utils.py index bb57da10..6272ef26 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -5,6 +5,7 @@ from .errors import PNERR_JSON_NOT_SERIALIZABLE from .exceptions import PubNubException +# TODO: migrate to :six: helpers instead of following try: from urllib.parse import urlunsplit as pn_urlunsplit except ImportError: From 4ed5b4b0273e988b874f97d59990871a038f010f Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 6 Jun 2016 17:51:18 -0700 Subject: [PATCH 098/468] 3.7.8 --- VERSION | 2 +- pubnub.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index d2577d97..a0fc9e07 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.7 +3.7.8 diff --git a/pubnub.py b/pubnub.py index bed550ae..4cf76291 100755 --- a/pubnub.py +++ b/pubnub.py @@ -6,7 +6,7 @@ # http://www.pubnub.com/ # ----------------------------------- -# PubNub 3.7.6 Real-time Push Cloud API +# PubNub 3.7.8 Real-time Push Cloud API # ----------------------------------- @@ -305,7 +305,7 @@ def __init__( """ self.origin = origin - self.version = '3.7.7' + self.version = '3.7.8' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key diff --git a/setup.py b/setup.py index e9b53a6b..a502c2a0 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='3.7.7', + version='3.7.8', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 1373c561779a9e0b0e4c2f9be6dff52f6260afb7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 7 Jun 2016 08:50:32 -0700 Subject: [PATCH 099/468] Fix tornados non-subscribe methods invokation --- pubnub/endpoints/endpoint.py | 12 ++ pubnub/exceptions.py | 3 +- pubnub/pubnub_tornado.py | 88 ++++++++++---- tests/integrational/tornado/test_publish.py | 124 ++++++++++++++------ 4 files changed, 170 insertions(+), 57 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index e0156d7f..ac860bb7 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -88,11 +88,23 @@ def callback_wrapper(status_category, response, response_info, exception): return self.pubnub.request_async(self.name(), options, callback_wrapper, self._cancellation_event) + def future(self): + def handler(): + self.validate_params() + return self.options() + + return self.pubnub \ + .request_future(handler, + create_response=self.create_response, + create_status_response=self.create_status_response + ) + def deferred(self): def handler(): self.validate_params() return self.options() + # TODO: move .addCallback(self.create_response) logic to request_deferred() return self.pubnub \ .request_deferred(handler) \ .addCallback(self.create_response) diff --git a/pubnub/exceptions.py b/pubnub/exceptions.py index 0fe115b3..44749d7d 100755 --- a/pubnub/exceptions.py +++ b/pubnub/exceptions.py @@ -1,8 +1,9 @@ class PubNubException(Exception): - def __init__(self, errormsg="", status_code=0, pn_error=None): + def __init__(self, errormsg="", status_code=0, pn_error=None, status=None): self._errormsg = errormsg self._status_code = status_code self._pn_error = pn_error + self._status = status if len(str(errormsg)) > 0 and int(status_code) > 0: msg = str(pn_error) + " (" + str(status_code) + "): " + str(errormsg) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 54865a9c..b049aebc 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -2,6 +2,8 @@ import logging import time +from .enums import PNStatusCategory +from .structures import ResponseInfo from . import utils from .exceptions import PubNubException from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED @@ -54,13 +56,18 @@ def __init__(self, config): 'Accept-Encoding': 'utf-8' } - def async_error_to_return(self, e, errback): - errback(e) + def request_sync(self, *args): + raise NotImplementedError - def request_async(self, options, success, error): - def _invoke(func, data): - if func is not None: - func(data) + def request_async(self, *args): + raise NotImplementedError + + def request_deferred(self, *args): + raise NotImplementedError + + def request_future(self, options_func, create_response, create_status_response): + options = options_func() + future = Future() url = utils.build_url(self.config.scheme(), self.config.origin, options.path, options.query_string) @@ -76,18 +83,44 @@ def _invoke(func, data): def response_callback(response): body = response.body + response_info = None + status_category = PNStatusCategory.PNUnknownCategory if body is not None and len(body) > 0: + url = utils.urlparse(response.effective_url) + query = utils.parse_qs(url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=response.code, + tls_enabled='https' == url.scheme, + origin=url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=response.request + ) + try: data = json.loads(body) except TypeError: try: data = json.loads(body.decode("utf-8")) except ValueError: - _invoke(error, PubNubException( + tornado_result = TornadoEnvelope( + create_response(None), + create_status_response(status_category, response, response_info, PubNubException( pn_error=PNERR_JSON_DECODING_FAILED, - errormsg='json decode error' - )) + errormsg='json decode error') + ) + ) + future.set_exception(tornado_result) return else: data = "N/A" @@ -98,26 +131,35 @@ def response_callback(response): else: err = PNERR_CLIENT_ERROR - _invoke(error, PubNubException( - errormsg=data, - pn_error=err, - status_code=response.code + if response.code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if response.code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + future.set_exception(PubNubException( + errormsg=data, + pn_error=err, + status_code=response.code )) + + # future.set_exception(tornado_result) else: - _invoke(success, data) + future.set_result(TornadoEnvelope( + result=create_response(data), + status=create_status_response(status_category, data, response_info, None) + ) + ) self.http.fetch( request=request, callback=response_callback ) - # TODO: add Tornado Feature support - def request_deferred(self, options_func): - options = options_func() - future = Future() - self.request_async( - options, - lambda res: future.set_result(res), - lambda err: future.set_exception(err) - ) return future + + +class TornadoEnvelope(object): + def __init__(self, result, status): + self.result = result + self.status = status diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 0748ef76..d5bd8b4d 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -1,69 +1,91 @@ import logging -import pubnub + +import tornado +from tornado.concurrent import Future + +import pubnub as pn from tornado.testing import AsyncTestCase + +from pubnub.exceptions import PubNubException +from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub_tornado import PubNubTornado +from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope from tests.helper import pnconf, pnconf_enc -pubnub.set_stream_logger('pubnub', logging.DEBUG) +pn.set_stream_logger('pubnub', logging.DEBUG) ch = "tornado-int-publish" class TestPubNubAsyncPublish(AsyncTestCase): - def assert_success(self, pub): - self.pubnub.set_ioloop(self.io_loop) + def setUp(self): + AsyncTestCase.setUp(self) + self.env = None - def success(res): - self.pubnub.stop() - self.stop() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 0 - assert len(res.original_response) > 0 + def callback(self, tornado_res): + self.env = tornado_res.result() + self.pubnub.stop() + self.stop() - def error(err): - self.pubnub.stop() - self.stop() - self.fail("Error while success is expected: " + str(err)) + def assert_success(self, pub): + self.pubnub.set_ioloop(self.io_loop) - pub.async(success, error) + pub.future().add_done_callback(self.callback) self.pubnub.start() self.wait() + assert isinstance(self.env, TornadoEnvelope) + assert isinstance(self.env.result, PNPublishResult) + assert isinstance(self.env.status, PNStatus) + assert self.env.result.timetoken > 0 + assert len(self.env.result.original_response) > 0 + + @tornado.testing.gen_test + def assert_success_yield(self, pub): + self.pubnub.set_ioloop(self.io_loop) + + envelope = yield pub.future() + + assert isinstance(envelope, TornadoEnvelope) + assert isinstance(envelope.result, PNPublishResult) + assert isinstance(envelope.status, PNStatus) + assert envelope.result.timetoken > 0 + assert len(envelope.result.original_response) > 0 + def assert_success_publish_get(self, msg): self.pubnub = PubNubTornado(pnconf) self.assert_success(self.pubnub.publish().channel(ch).message(msg)) + self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg)) def assert_success_publish_post(self, msg): self.pubnub = PubNubTornado(pnconf) self.assert_success(self.pubnub.publish().channel(ch).message(msg).use_post(True)) + self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg).use_post(True)) def assert_success_publish_get_encrypted(self, msg): self.pubnub = PubNubTornado(pnconf_enc) self.assert_success(self.pubnub.publish().channel(ch).message(msg)) + self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg)) def assert_success_publish_post_encrypted(self, msg): self.pubnub = PubNubTornado(pnconf_enc) self.assert_success(self.pubnub.publish().channel(ch).message(msg).use_post(True)) + self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg).use_post(True)) - def assert_error(self, pub, expected_err_msg): - def success(res): - self.pubnub.stop() - self.stop() - self.fail("Success while while is expected: " + str(res)) + def assert_client_side_error(self, pub, expected_err_msg): + try: + yield pub.future() - def error(err): - self.pubnub.stop() - self.stop() - assert expected_err_msg in str(err) + self.pubnub.start() + self.wait() + except PubNubException as e: + self.assertIn(expected_err_msg, str(e)) - pub.async(success, error) - - self.pubnub.start() - self.wait() + self.pubnub.stop() + self.stop() def test_publish_string_via_get(self): self.assert_success_publish_get("hi") @@ -97,13 +119,13 @@ def test_error_missing_message(self): self.pubnub = PubNubTornado(pnconf) self.pubnub.set_ioloop(self.io_loop) - self.assert_error(self.pubnub.publish().channel(ch).message(None), "Message missing") + self.assert_client_side_error(self.pubnub.publish().channel(ch).message(None), "Message missing") def test_error_missing_channel(self): self.pubnub = PubNubTornado(pnconf) self.pubnub.set_ioloop(self.io_loop) - self.assert_error(self.pubnub.publish().channel("").message("hey"), "Channel missing") + self.assert_client_side_error(self.pubnub.publish().channel("").message("hey"), "Channel missing") def test_error_non_serializable(self): self.pubnub = PubNubTornado(pnconf) @@ -112,7 +134,38 @@ def test_error_non_serializable(self): def method(): pass - self.assert_error(self.pubnub.publish().channel(ch).message(method), "not JSON serializable") + self.assert_client_side_error(self.pubnub.publish().channel(ch).message(method), "not JSON serializable") + + def sserr_cb(self, env): + assert isinstance(env, Future) + exception = env.exception() + + self.pubnub.stop() + # this kind of assertion will not fail the test if'll be moved below `self.stop()` call + # but also not raises correct exception, timeout exception will be raised on fail instead + self.assertIn(self.expected_err_msg, str(exception)) + self.stop() + + def assert_server_side_error(self, pub, expected_err_msg): + self.expected_err_msg = expected_err_msg + pub.future().add_done_callback(self.sserr_cb) + + self.pubnub.start() + self.wait() + + @tornado.testing.gen_test + def assert_server_side_error_yield(self, pub, expected_err_msg): + + try: + yield pub.future() + + self.pubnub.start() + self.wait() + except PubNubException as e: + self.assertIn(expected_err_msg, str(e)) + + self.pubnub.stop() + self.stop() def test_error_invalid_key(self): conf = PNConfiguration() @@ -122,16 +175,21 @@ def test_error_invalid_key(self): self.pubnub = PubNubTornado(conf) self.pubnub.set_ioloop(self.io_loop) - self.assert_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") + self.assert_server_side_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") + self.assert_server_side_error_yield(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") def test_publish_with_meta(self): self.pubnub = PubNubTornado(pnconf) self.assert_success( self.pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + self.assert_success_yield( + self.pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) def test_publish_do_not_store(self): self.pubnub = PubNubTornado(pnconf) self.assert_success( self.pubnub.publish().channel(ch).message("hey").should_store(False)) + self.assert_success_yield( + self.pubnub.publish().channel(ch).message("hey").should_store(False)) From 16ee423fef42a6075201a5db37e1af0704d37cc9 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 7 Jun 2016 09:08:54 -0700 Subject: [PATCH 100/468] Fix tornado here_now test --- tests/integrational/tornado/test_here_now.py | 31 +++++++------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index abd09a25..c11c649d 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -1,31 +1,22 @@ +import tornado from tornado.testing import AsyncHTTPTestCase, AsyncTestCase - -from pubnub.pnconfiguration import PNConfiguration - from pubnub.pubnub_tornado import PubNubTornado +from tests.helper import pnconf -class TestPubNubAsyncAsyncHereNow(AsyncTestCase): - +class TestPubNubAsyncHereNow(AsyncTestCase): + @tornado.testing.gen_test def test_success(self): - pnconf = PNConfiguration() pubnub = PubNubTornado(pnconf) pubnub.set_ioloop(self.io_loop) - def success(res): - print(res.total_occupancy) - pubnub.stop() - self.stop() - - def error(err): - print(err) - pubnub.stop() - self.stop() - - pubnub.here_now() \ + env = yield pubnub.here_now() \ .channels(["ch1", "ch2", "ch3", "demo"]) \ .include_state(False) \ - .async(success, error) + .future() + + print(env.result) + + pubnub.stop() + self.stop() - pubnub.start() - self.wait() From 09e887013e4bd786ac25a56644e9c08fe57aecc8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 7 Jun 2016 09:26:30 -0700 Subject: [PATCH 101/468] Fix tornado publish tests python v2.6 compatibility --- tests/integrational/tornado/test_publish.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index d5bd8b4d..1a969381 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -82,7 +82,7 @@ def assert_client_side_error(self, pub, expected_err_msg): self.pubnub.start() self.wait() except PubNubException as e: - self.assertIn(expected_err_msg, str(e)) + assert expected_err_msg in str(e) self.pubnub.stop() self.stop() @@ -143,7 +143,7 @@ def sserr_cb(self, env): self.pubnub.stop() # this kind of assertion will not fail the test if'll be moved below `self.stop()` call # but also not raises correct exception, timeout exception will be raised on fail instead - self.assertIn(self.expected_err_msg, str(exception)) + assert self.expected_err_msg in str(exception) self.stop() def assert_server_side_error(self, pub, expected_err_msg): From dc0931164897a2f038125ba0939aa78601e74a02 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 7 Jun 2016 09:29:31 -0700 Subject: [PATCH 102/468] Fix another tornado publish test compatibility issue --- tests/integrational/tornado/test_publish.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 1a969381..21a08fc9 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -162,7 +162,7 @@ def assert_server_side_error_yield(self, pub, expected_err_msg): self.pubnub.start() self.wait() except PubNubException as e: - self.assertIn(expected_err_msg, str(e)) + assert expected_err_msg in str(e) self.pubnub.stop() self.stop() From 78ad431f24c5bd692c9120f16921bea66f9ad32b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 8 Jun 2016 01:59:37 -0700 Subject: [PATCH 103/468] Add original_response to status; Remove it from publish_result; Fix tornado publish demoapp --- examples/tornado/chat/app.py | 33 +++++++++++---------- pubnub/endpoints/endpoint.py | 4 ++- pubnub/models/consumer/common.py | 1 + pubnub/models/consumer/pubsub.py | 5 +--- pubnub/pubnub_tornado.py | 16 ++++++---- tests/integrational/native/test_publish.py | 4 +-- tests/integrational/tornado/test_publish.py | 4 +-- 7 files changed, 36 insertions(+), 31 deletions(-) diff --git a/examples/tornado/chat/app.py b/examples/tornado/chat/app.py index a53b18a1..a5a1364b 100644 --- a/examples/tornado/chat/app.py +++ b/examples/tornado/chat/app.py @@ -4,7 +4,7 @@ import sys import os -from tornado.stack_context import ExceptionStackContext +from pubnub.exceptions import PubNubException d = os.path.dirname PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) @@ -22,18 +22,20 @@ def get(self): pnconf.publish_key = "demo" pubnub = PubNubTornado(pnconf) - pubnub.publish().channel("my_channel").message("hello").async(self.success, self.error) + pubnub.publish().channel("my_channel").message("hello").future().add_done_callback(self.callback) - def success(self, response): - self.write(str(response.envelope)) - self.finish() + def callback(self, future): + if future.exception() is not None: + self.set_status(404) + self.write("Something went wrong:" + str(future.exception())) + else: + envelope = future.result() + self.write("success/") + self.write(str(envelope.status.original_response)) - def error(self, error): - self.write(str(error)) self.finish() -# TODO: implement yielding pubnub result class YieldHandler(tornado.web.RequestHandler): @tornado.gen.coroutine def get(self): @@ -42,18 +44,17 @@ def get(self): pnconf.publish_key = "demo" pubnub = PubNubTornado(pnconf) - def handle_err(type, second, third): - self.write(str(type)) - - with ExceptionStackContext(handle_err): - response = yield pubnub.publish().channel("my_channel").message("hello").deferred() - self.write(str(response)) + try: + envelope = yield pubnub.publish().channel("my_channel").message("hello").future() + self.write(str(envelope.status.original_response)) + except PubNubException as e: + self.write(str(e)) def make_app(): return tornado.web.Application([ - (r"/async", AsyncHandler), - (r"/yield", YieldHandler), + (r"/publish_callback", AsyncHandler), + (r"/publish_yield", YieldHandler), ]) if __name__ == "__main__": diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index ac860bb7..feac9044 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -142,11 +142,13 @@ def create_status_response(self, category, response, response_info, exception): if response is None or exception is not None: pn_status.error = True + if response is not None: + pn_status.original_response = response + if exception is not None: pn_status.error_data = PNErrorData(str(exception), exception) if response_info is not None: - pn_status.status_code = response_info.status_code pn_status.tls_enabled = response_info.tls_enabled pn_status.origin = response_info.origin diff --git a/pubnub/models/consumer/common.py b/pubnub/models/consumer/common.py index 38bf1123..5baf4f40 100644 --- a/pubnub/models/consumer/common.py +++ b/pubnub/models/consumer/common.py @@ -13,6 +13,7 @@ def __init__(self): self.auth_key = None self.origin = None self.client_request = None + self.original_response = None self.affected_channels = None self.affected_groups = None diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index 0801a182..b9fe67d3 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -45,11 +45,8 @@ def __init__(self, event, uuid, timestamp, occupancy, subscribed_channel, actual class PNPublishResult(object): def __init__(self, envelope, timetoken): """ - Representation of server response + Representation of publish server response - :param envelope: original response from server :param timetoken: of publish operation """ - self.original_response = envelope - self.envelope = envelope self.timetoken = timetoken diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index b049aebc..b51789cc 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -56,6 +56,10 @@ def __init__(self, config): 'Accept-Encoding': 'utf-8' } + def subscribe(self): + pass + # return SubscribeBuilder(self._subscription_manager) + def request_sync(self, *args): raise NotImplementedError @@ -116,8 +120,8 @@ def response_callback(response): tornado_result = TornadoEnvelope( create_response(None), create_status_response(status_category, response, response_info, PubNubException( - pn_error=PNERR_JSON_DECODING_FAILED, - errormsg='json decode error') + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error') ) ) future.set_exception(tornado_result) @@ -138,9 +142,9 @@ def response_callback(response): status_category = PNStatusCategory.PNBadRequestCategory future.set_exception(PubNubException( - errormsg=data, - pn_error=err, - status_code=response.code + errormsg=data, + pn_error=err, + status_code=response.code )) # future.set_exception(tornado_result) @@ -148,7 +152,7 @@ def response_callback(response): future.set_result(TornadoEnvelope( result=create_response(data), status=create_status_response(status_category, data, response_info, None) - ) + ) ) self.http.fetch( diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native/test_publish.py index f6de8a26..49f47cb1 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native/test_publish.py @@ -399,8 +399,8 @@ def test_invalid_key(self): self.event.wait() assert self.status.is_error() - assert self.response.envelope[0] is 0 - assert self.response.envelope[1] == 'Invalid Key' + assert self.status.original_response[0] is 0 + assert self.status.original_response[1] == 'Invalid Key' assert "HTTP Client Error (400):" in str(self.status.error_data.exception) assert "Invalid Key" in str(self.status.error_data.exception) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 21a08fc9..6987be6b 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -41,7 +41,7 @@ def assert_success(self, pub): assert isinstance(self.env.result, PNPublishResult) assert isinstance(self.env.status, PNStatus) assert self.env.result.timetoken > 0 - assert len(self.env.result.original_response) > 0 + assert len(self.env.status.original_response) > 0 @tornado.testing.gen_test def assert_success_yield(self, pub): @@ -53,7 +53,7 @@ def assert_success_yield(self, pub): assert isinstance(envelope.result, PNPublishResult) assert isinstance(envelope.status, PNStatus) assert envelope.result.timetoken > 0 - assert len(envelope.result.original_response) > 0 + assert len(envelope.status.original_response) > 0 def assert_success_publish_get(self, msg): self.pubnub = PubNubTornado(pnconf) From 1a1582c796aedc2335443bf6007e820d534d04c9 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 9 Jun 2016 08:58:13 -0700 Subject: [PATCH 104/468] Add a basic subscription to Tornado platform --- examples/tornado/chat/app.py | 64 ++++++-- examples/tornado/chat/index.html | 26 ++++ pubnub/builders.py | 21 ++- pubnub/dtos.py | 9 ++ pubnub/managers.py | 139 ++++++++--------- pubnub/pubnub.py | 71 ++++++++- pubnub/pubnub_tornado.py | 156 +++++++++++++++++--- pubnub/workers.py | 21 +-- tests/integrational/tornado/test_publish.py | 4 +- 9 files changed, 390 insertions(+), 121 deletions(-) create mode 100644 examples/tornado/chat/index.html diff --git a/examples/tornado/chat/app.py b/examples/tornado/chat/app.py index a5a1364b..ca580894 100644 --- a/examples/tornado/chat/app.py +++ b/examples/tornado/chat/app.py @@ -4,6 +4,7 @@ import sys import os +from pubnub.callbacks import SubscribeCallback from pubnub.exceptions import PubNubException d = os.path.dirname @@ -11,17 +12,24 @@ sys.path.append(PUBNUB_ROOT) from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub_tornado import PubNubTornado +from pubnub.pubnub_tornado import PubNubTornado, PubNubTornadoException +pnconf = PNConfiguration() +pnconf.subscribe_key = "demo" +pnconf.publish_key = "demo" -class AsyncHandler(tornado.web.RequestHandler): +pubnub = PubNubTornado(pnconf) + + +class MainHandler(tornado.web.RequestHandler): @tornado.web.asynchronous def get(self): - pnconf = PNConfiguration() - pnconf.subscribe_key = "demo" - pnconf.publish_key = "demo" - pubnub = PubNubTornado(pnconf) + self.render("index.html") + +class AsyncHandler(tornado.web.RequestHandler): + @tornado.web.asynchronous + def get(self): pubnub.publish().channel("my_channel").message("hello").future().add_done_callback(self.callback) def callback(self, future): @@ -39,22 +47,56 @@ def callback(self, future): class YieldHandler(tornado.web.RequestHandler): @tornado.gen.coroutine def get(self): - pnconf = PNConfiguration() - pnconf.subscribe_key = "demo" - pnconf.publish_key = "demo" - pubnub = PubNubTornado(pnconf) - try: envelope = yield pubnub.publish().channel("my_channel").message("hello").future() self.write(str(envelope.status.original_response)) + except PubNubTornadoException as e: + self.write(str(e)) + + +class Subscription(SubscribeCallback): + @tornado.gen.coroutine + def status(self, pubnub, status): + print('# satus', str(status)) + try: + yield pubnub.publish().channel("my_channel").message("hey").future() + except Exception as e: + print("failed to publish" + str(e)) + + def presence(self, pubnub, presence): + print('# presence') + + def message(self, pubnub, result): + print('# message', result.message) + + +class StopHandler(tornado.web.RequestHandler): + @tornado.gen.coroutine + def get(self): + try: + pubnub.stop() + except PubNubException as e: + self.write(str(e)) + + +class SubscribeHandler(tornado.web.RequestHandler): + @tornado.gen.coroutine + def get(self): + pubnub.add_listener(Subscription()) + + try: + pubnub.subscribe().channels("my_channel").execute() except PubNubException as e: self.write(str(e)) def make_app(): return tornado.web.Application([ + (r"/", MainHandler), (r"/publish_callback", AsyncHandler), (r"/publish_yield", YieldHandler), + (r"/subscribe", SubscribeHandler), + (r"/unsubscribe", StopHandler), ]) if __name__ == "__main__": diff --git a/examples/tornado/chat/index.html b/examples/tornado/chat/index.html new file mode 100644 index 00000000..f6fe7133 --- /dev/null +++ b/examples/tornado/chat/index.html @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + PubNub Tornado Chat Demo App + + +
      +
      +
      + +
      +
      +
      + + \ No newline at end of file diff --git a/pubnub/builders.py b/pubnub/builders.py index 5037a959..43de84c8 100644 --- a/pubnub/builders.py +++ b/pubnub/builders.py @@ -1,6 +1,8 @@ from abc import ABCMeta, abstractmethod -from .dtos import SubscribeOperation +import six + +from .dtos import SubscribeOperation, UnsubscribeOperation class PubSubBuilder(object): @@ -12,10 +14,15 @@ def __init__(self, subscription_manager): self._channel_group_subscriptions = [] def channels(self, channels_list): - self._channel_subscriptions.extend(channels_list) + if isinstance(channels_list, six.string_types): + self._channel_subscriptions.append(channels_list) + elif isinstance(channels_list, (list, dict)): + self._channel_subscriptions.extend(channels_list) + return self def channel_groups(self, channel_groups_list): + # TODO: do the same if block as for channels self._channel_group_subscriptions.extend(channel_groups_list) return self @@ -53,3 +60,13 @@ def execute(self): ) self._subscription_manager.adapt_subscribe_builder(subscribe_operation) + + +class UnsubscribeBuilder(PubSubBuilder): + def execute(self): + unsubscribe_operation = UnsubscribeOperation( + channels=self._channel_subscriptions, + channel_groups=self._channel_group_subscriptions + ) + + self._subscription_manager.adapt_unsubscribe_builder(unsubscribe_operation) diff --git a/pubnub/dtos.py b/pubnub/dtos.py index 9d4fb65b..fa450953 100644 --- a/pubnub/dtos.py +++ b/pubnub/dtos.py @@ -12,3 +12,12 @@ def __init__(self, channels=None, channel_groups=None, presence_enabled=None, ti self.channel_groups = channel_groups self.presence_enabled = presence_enabled self.timetoken = timetoken + + +class UnsubscribeOperation(object): + def __init__(self, channels=None, channel_groups=None): + assert isinstance(channels, (list, tuple)) + assert isinstance(channel_groups, (list, tuple)) + + self.channels = channels + self.channel_groups = channel_groups diff --git a/pubnub/managers.py b/pubnub/managers.py index 48700ed5..bc31c3c5 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -1,15 +1,12 @@ -import threading +from abc import abstractmethod, ABCMeta -from . import utils -from .dtos import SubscribeOperation -from .models.server.subscribe import SubscribeEnvelope from .enums import PNStatusCategory +from .models.consumer.common import PNStatus +from .models.server.subscribe import SubscribeEnvelope +from .dtos import SubscribeOperation, UnsubscribeOperation from .callbacks import SubscribeCallback from .models.subscription_item import SubscriptionItem -from .endpoints.pubsub.subscribe import Subscribe -from .workers import SubscribeMessageWorker from .utils import synchronized -from .models.consumer.common import PNStatus class PublishSequenceManager(object): @@ -55,6 +52,15 @@ def adapt_subscribe_builder(self, subscribe_operation): if subscribe_operation.presence_enabled: self._presence_groups[group] = SubscriptionItem(name=group) + def adapt_unsubscribe_builder(self, unsubscribe_operation): + for channel in unsubscribe_operation.channels: + self._channels.pop(channel) + self._presence_channels.pop(channel) + + for group in unsubscribe_operation.channel_groups: + self._groups.pop(group) + self._presence_groups.pop(group) + @staticmethod def _prepare_membership_list(data_storage, presence_storage, include_presence): response = [] @@ -96,11 +102,12 @@ def announce_presence(self, presence): class SubscriptionManager(object): + __metaclass__ = ABCMeta + def __init__(self, pubnub_instance): self._pubnub = pubnub_instance self._subscription_status_announced = False - # TODO: ensure this is a correct Queue - self._message_queue = utils.Queue() + self._subscription_state = StateManager() self._listener_manager = ListenerManager(self._pubnub) self._timetoken = int(0) @@ -111,12 +118,23 @@ def __init__(self, pubnub_instance): self._subscribe_call = None self._heartbeat_call = None - self._consumer_event = threading.Event() - consumer = SubscribeMessageWorker(self._pubnub, self._listener_manager, - self._message_queue, self._consumer_event) - self._consumer_thread = threading.Thread(target=consumer.run, - name="SubscribeMessageWorker") - self._consumer_thread.start() + self._start_worker() + + @abstractmethod + def _start_worker(self): + pass + + @abstractmethod + def _set_consumer_event(self): + pass + + @abstractmethod + def _message_queue_put(self, message): + pass + + @abstractmethod + def _start_subscribe_loop(self): + pass def add_listener(self, listener): self._listener_manager.add_listener(listener) @@ -132,6 +150,16 @@ def adapt_subscribe_builder(self, subscribe_operation): self.reconnect() + @synchronized + def adapt_unsubscribe_builder(self, unsubscribe_operation): + assert isinstance(unsubscribe_operation, UnsubscribeOperation) + + self._subscription_state.adapt_unsubscribe_builder(unsubscribe_operation) + + # TODO: invoke leave request with callback + # Leave() + self.reconnect() + @synchronized def reconnect(self): self._should_stop = False @@ -142,60 +170,33 @@ def stop(self): # self._stop_heartbeat_timer() self._stop_subscribe_loop() self._should_stop = True - self._consumer_event.set() - - def _start_subscribe_loop(self): - self._stop_subscribe_loop() - - combined_channels = self._subscription_state.prepare_channel_list(True) - combined_groups = self._subscription_state.prepare_channel_group_list(True) - - if len(combined_channels) == 0 and len(combined_groups) == 0: - return - - def callback(raw_result, status): - """ SubscribeEndpoint callback""" - assert isinstance(status, PNStatus) - - if status.is_error(): - if status.category is PNStatusCategory.PNTimeoutCategory and not self._should_stop: - self._start_subscribe_loop() - else: - self._listener_manager.announce_status(status) - - return - - if not self._subscription_status_announced: - pn_status = PNStatus() - pn_status.category = PNStatusCategory.PNConnectedCategory, - pn_status.status_code = status.status_code - pn_status.auth_key = status.auth_key - pn_status.operation = status.operation - pn_status.client_request = status.client_request - pn_status.origin = status.origin - pn_status.tls_enabled = status.tls_enabled - - self._subscription_status_announced = True - self._listener_manager.announce_status(pn_status) - - result = SubscribeEnvelope.from_json(raw_result) - if result.messages is not None and len(result.messages) > 0: - for message in result.messages: - self._message_queue.put(message) - - # REVIEW: is int compatible with long for Python 2 - self._timetoken = int(result.metadata.timetoken) - self._region = int(result.metadata.region) - self._start_subscribe_loop() - - try: - self._subscribe_call = Subscribe(self._pubnub) \ - .channels(combined_channels).groups(combined_groups) \ - .timetoken(self._timetoken).region(self._region) \ - .filter_expression(self._pubnub.config.filter_expression) \ - .async(callback) - except Exception as e: - print("failed", e) + self._set_consumer_event() + + def _handle_endpoint_call(self, raw_result, status): + assert isinstance(status, PNStatus) + + if not self._subscription_status_announced: + pn_status = PNStatus() + pn_status.category = PNStatusCategory.PNConnectedCategory, + pn_status.status_code = status.status_code + pn_status.auth_key = status.auth_key + pn_status.operation = status.operation + pn_status.client_request = status.client_request + pn_status.origin = status.origin + pn_status.tls_enabled = status.tls_enabled + + self._subscription_status_announced = True + self._listener_manager.announce_status(pn_status) + + result = SubscribeEnvelope.from_json(raw_result) + if result.messages is not None and len(result.messages) > 0: + for message in result.messages: + self._message_queue_put(message) + + # REVIEW: is int compatible with long for Python 2 + self._timetoken = int(result.metadata.timetoken) + self._region = int(result.metadata.region) + self._start_subscribe_loop() def _stop_subscribe_loop(self): sc = self._subscribe_call diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 4662804e..4a65d27c 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -2,6 +2,8 @@ import threading import requests +from .endpoints.pubsub.subscribe import Subscribe +from .workers import SubscribeMessageWorker from .pnconfiguration import PNConfiguration from .builders import SubscribeBuilder from .managers import SubscriptionManager @@ -26,7 +28,7 @@ def __init__(self, config): PubNubCore.__init__(self, config) if self.config.enable_subscribe: - self._subscription_manager = SubscriptionManager(self) + self._subscription_manager = NativeSubscriptionManager(self) def subscribe(self): return SubscribeBuilder(self._subscription_manager) @@ -257,3 +259,70 @@ def join(self): def executed_cb(self): self.is_executed = True + +class NativeSubscriptionManager(SubscriptionManager): + def __init__(self, pubnub_instance): + self._message_queue = utils.Queue() + self._consumer_event = threading.Event() + super(NativeSubscriptionManager, self).__init__(pubnub_instance) + + def _set_consumer_event(self): + self._consumer_event.set() + + def _message_queue_put(self, message): + self._message_queue.put(message) + + def _start_worker(self): + consumer = NativeSubscribeMessageWorker(self._pubnub, self._listener_manager, + self._message_queue, self._consumer_event) + self._consumer_thread = threading.Thread(target=consumer.run, + name="SubscribeMessageWorker") + self._consumer_thread.start() + + def _start_subscribe_loop(self): + self._stop_subscribe_loop() + + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) + + if len(combined_channels) == 0 and len(combined_groups) == 0: + return + + def callback(raw_result, status): + """ SubscribeEndpoint callback""" + if status.is_error(): + if status.category is PNStatusCategory.PNTimeoutCategory and not self._should_stop: + self._start_subscribe_loop() + else: + self._listener_manager.announce_status(status) + + return + + self._handle_endpoint_call(raw_result, status) + + try: + self._subscribe_call = Subscribe(self._pubnub) \ + .channels(combined_channels).groups(combined_groups) \ + .timetoken(self._timetoken).region(self._region) \ + .filter_expression(self._pubnub.config.filter_expression) \ + .async(callback) + except Exception as e: + print("failed", e) + + +class NativeSubscribeMessageWorker(SubscribeMessageWorker): + def _take_message(self): + while not self._event.isSet(): + try: + # TODO: get rid of 1s timeout + msg = self._queue.get(True, 1) + if msg is not None: + self._process_incoming_payload(msg) + self._queue.task_done() + except utils.QueueEmpty: + continue + except Exception as e: + # TODO: move to finally + self._queue.task_done() + self._event.set() + logger.warn("take message interrupted: %s" % str(e)) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index b51789cc..e371f27f 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -2,9 +2,19 @@ import logging import time +import datetime + +from . import utils +from .callbacks import SubscribeCallback +from .models.server.subscribe import SubscribeEnvelope +from .workers import SubscribeMessageWorker +from .endpoints.pubsub.subscribe import Subscribe +from .models.consumer.common import PNStatus +from .dtos import SubscribeOperation, UnsubscribeOperation +from .managers import StateManager, ListenerManager, SubscriptionManager +from .builders import SubscribeBuilder from .enums import PNStatusCategory from .structures import ResponseInfo -from . import utils from .exceptions import PubNubException from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED from .pubnub_core import PubNubCore @@ -12,42 +22,51 @@ import tornado.httpclient import tornado.ioloop from tornado.concurrent import Future +from tornado.queues import Queue +from tornado.locks import Event +from tornado import ioloop +from tornado import gen -default_ioloop = tornado.ioloop.IOLoop.instance() +# default_ioloop = tornado.ioloop.IOLoop.instance() logger = logging.getLogger("pubnub") class PubNubTornado(PubNubCore): def stop(self): - self._ioloop.stop() + self.ioloop.stop() def start(self): - self._ioloop.start() + self.ioloop.start() def timeout(self, delay, callback, *args): handle = None def cancel(): - self._ioloop.remove_timeout(handle) + self.ioloop.remove_timeout(handle) def cb(): if callback is not None: callback(*args) - handle = self._ioloop.add_timeout(time.time() + float(delay), cb) + handle = self.ioloop.add_timeout(time.time() + float(delay), cb) return cancel + # TODO: deprecate def set_ioloop(self, ioloop): - self._ioloop = ioloop + self.ioloop = ioloop def sdk_platform(self): return "-Tornado" - def __init__(self, config): + def __init__(self, config, custom_ioloop=None): super(PubNubTornado, self).__init__(config) - self._ioloop = default_ioloop + self.ioloop = custom_ioloop or ioloop.IOLoop.instance() + self._subscription_manager = TornadoSubscriptionManager(self) + + # TODO: choose a correct client here http://www.tornadoweb.org/en/stable/httpclient.html + # TODO: 1000? self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) self.id = None # TODO: add accept encoding should be configurable @@ -56,9 +75,17 @@ def __init__(self, config): 'Accept-Encoding': 'utf-8' } + def add_listener(self, listener): + if self._subscription_manager is not None: + self._subscription_manager.add_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + def subscribe(self): + return SubscribeBuilder(self._subscription_manager) + + def unsubscribe(self): pass - # return SubscribeBuilder(self._subscription_manager) def request_sync(self, *args): raise NotImplementedError @@ -90,9 +117,9 @@ def response_callback(response): response_info = None status_category = PNStatusCategory.PNUnknownCategory - if body is not None and len(body) > 0: - url = utils.urlparse(response.effective_url) - query = utils.parse_qs(url.query) + if response is not None: + request_url = utils.urlparse(response.effective_url) + query = utils.parse_qs(request_url.query) uuid = None auth_key = None @@ -104,13 +131,14 @@ def response_callback(response): response_info = ResponseInfo( status_code=response.code, - tls_enabled='https' == url.scheme, - origin=url.hostname, + tls_enabled='https' == request_url.scheme, + origin=request_url.hostname, uuid=uuid, auth_key=auth_key, client_request=response.request ) + if body is not None and len(body) > 0: try: data = json.loads(body) except TypeError: @@ -141,10 +169,18 @@ def response_callback(response): if response.code == 400: status_category = PNStatusCategory.PNBadRequestCategory - future.set_exception(PubNubException( - errormsg=data, - pn_error=err, - status_code=response.code + if response.code == 599: + status_category = PNStatusCategory.PNTimeoutCategory + + # TODO: return exception with stateinfo + future.set_exception(PubNubTornadoException( + result=data, + status=create_status_response(status_category, data, response_info, + PubNubException( + errormsg=data, + pn_error=err, + status_code=response.code, + )) )) # future.set_exception(tornado_result) @@ -163,7 +199,89 @@ def response_callback(response): return future +class TornadoSubscribeMessageWorker(SubscribeMessageWorker): + @tornado.gen.coroutine + def run(self): + yield self._take_message() + + @tornado.gen.coroutine + def _take_message(self): + i = 0 + while not self._event.is_set(): + try: + msg = yield self._queue.get(datetime.timedelta(seconds=1)) + if msg is not None: + self._process_incoming_payload(msg) + self._queue.task_done() + except tornado.gen.TimeoutError: + print("%d continue" % i) + i += 1 + continue + # TODO: should context of callback be changed? + # except Exception as e: + # print("!!! ex") + # break + + +# TODO: inherit from managers.SubscriptionManager +class TornadoSubscriptionManager(SubscriptionManager): + def __init__(self, pubnub_instance): + self._message_queue = Queue() + self._consumer_event = Event() + super(TornadoSubscriptionManager, self).__init__(pubnub_instance) + + def _set_consumer_event(self): + self._consumer_event.set() + + def _message_queue_put(self, message): + self._message_queue.put(message) + + def _start_worker(self): + self._consumer = TornadoSubscribeMessageWorker(self._pubnub, self._listener_manager, + self._message_queue, self._consumer_event) + + self._pubnub.ioloop.add_callback(self._consumer.run) + + @tornado.gen.coroutine + def _start_subscribe_loop(self): + self._stop_subscribe_loop() + + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) + + if len(combined_channels) == 0 and len(combined_groups) == 0: + return + + try: + envelope = yield Subscribe(self._pubnub) \ + .channels(combined_channels).groups(combined_groups) \ + .timetoken(self._timetoken).region(self._region) \ + .filter_expression(self._pubnub.config.filter_expression) \ + .future() + except PubNubTornadoException as e: + if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: + yield self._start_subscribe_loop() + else: + self._listener_manager.announce_status(e.status) + + return + except Exception as e: + print("!!! ex2", e) + return + + self._handle_endpoint_call(envelope.result, envelope.status) + + class TornadoEnvelope(object): def __init__(self, result, status): self.result = result self.status = status + + +class PubNubTornadoException(Exception): + def __init__(self, result, status): + self.result = result + self.status = status + + def __str__(self): + return str(self.status.error_data.exception) diff --git a/pubnub/workers.py b/pubnub/workers.py index 030ad277..0546a589 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -1,10 +1,8 @@ import logging +from abc import abstractmethod -from . import utils from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult from .models.server.subscribe import SubscribeMessage, PresenceEnvelope -# from .pubnub_core import PubNubCore -# from .managers import ListenerManager logger = logging.getLogger("pubnub") @@ -13,7 +11,7 @@ class SubscribeMessageWorker(object): def __init__(self, pubnub_instnace, listener_manager_instance, queue_instance, event): # assert isinstance(pubnub_instnace, PubNubCore) # assert isinstance(listener_manager_instance, ListenerManager) - assert isinstance(queue_instance, utils.Queue) + # assert isinstance(queue_instance, utils.Queue) self._pubnub = pubnub_instnace self._listener_manager = listener_manager_instance @@ -24,20 +22,9 @@ def __init__(self, pubnub_instnace, listener_manager_instance, queue_instance, e def run(self): self._take_message() + @abstractmethod def _take_message(self): - while not self._event.isSet(): - try: - # TODO: get rid of 1s timeout - msg = self._queue.get(True, 1) - if msg is not None: - self._process_incoming_payload(msg) - self._queue.task_done() - except utils.QueueEmpty: - continue - except Exception as e: - self._queue.task_done() - self._event.set() - logger.warn("take message interrupted: %s" % str(e)) + pass def _process_message(self, message_input): if self._pubnub.config.cipher_key is None: diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 6987be6b..8f55f489 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -11,7 +11,7 @@ from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope +from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope, PubNubTornadoException from tests.helper import pnconf, pnconf_enc pn.set_stream_logger('pubnub', logging.DEBUG) @@ -161,7 +161,7 @@ def assert_server_side_error_yield(self, pub, expected_err_msg): self.pubnub.start() self.wait() - except PubNubException as e: + except PubNubTornadoException as e: assert expected_err_msg in str(e) self.pubnub.stop() From 0ddf384e4aefb708e7ad73d4efd7e4c26b75a3ae Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 10 Jun 2016 02:39:49 -0700 Subject: [PATCH 105/468] Cleanup pubub_tornado.py --- pubnub/pubnub_tornado.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index e371f27f..0bd02f5d 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,17 +1,12 @@ import json import logging import time - import datetime from . import utils -from .callbacks import SubscribeCallback -from .models.server.subscribe import SubscribeEnvelope from .workers import SubscribeMessageWorker from .endpoints.pubsub.subscribe import Subscribe -from .models.consumer.common import PNStatus -from .dtos import SubscribeOperation, UnsubscribeOperation -from .managers import StateManager, ListenerManager, SubscriptionManager +from .managers import SubscriptionManager from .builders import SubscribeBuilder from .enums import PNStatusCategory from .structures import ResponseInfo @@ -21,13 +16,12 @@ import tornado.httpclient import tornado.ioloop +import tornado.gen from tornado.concurrent import Future from tornado.queues import Queue from tornado.locks import Event from tornado import ioloop -from tornado import gen -# default_ioloop = tornado.ioloop.IOLoop.instance() logger = logging.getLogger("pubnub") @@ -172,7 +166,6 @@ def response_callback(response): if response.code == 599: status_category = PNStatusCategory.PNTimeoutCategory - # TODO: return exception with stateinfo future.set_exception(PubNubTornadoException( result=data, status=create_status_response(status_category, data, response_info, @@ -182,8 +175,6 @@ def response_callback(response): status_code=response.code, )) )) - - # future.set_exception(tornado_result) else: future.set_result(TornadoEnvelope( result=create_response(data), @@ -223,7 +214,6 @@ def _take_message(self): # break -# TODO: inherit from managers.SubscriptionManager class TornadoSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): self._message_queue = Queue() From 87e1069b2bb8e7ea7513b3d9f873984179411c97 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 16 Jun 2016 00:17:47 -0700 Subject: [PATCH 106/468] Add Leave endpoint --- pubnub/endpoints/pubsub/leave.py | 66 ++++++++++++++++ pubnub/utils.py | 8 +- tests/functional/test_leave.py | 128 +++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 1 deletion(-) create mode 100644 pubnub/endpoints/pubsub/leave.py create mode 100644 tests/functional/test_leave.py diff --git a/pubnub/endpoints/pubsub/leave.py b/pubnub/endpoints/pubsub/leave.py new file mode 100644 index 00000000..10104f96 --- /dev/null +++ b/pubnub/endpoints/pubsub/leave.py @@ -0,0 +1,66 @@ +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType + + +class Leave(Endpoint): + # /v2/presence/sub-key//channel//leave?uuid= + LEAVE_PATH = "/v2/presence/sub-key/%s/channel/%s/leave" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = [] + self._groups = [] + + def channels(self, channels): + if isinstance(channels, (list, tuple)): + self._channels.extend(channels) + else: + self._channels.extend(utils.split_items(channels)) + + return self + + def channel_groups(self, channel_groups): + if isinstance(channel_groups, (list, tuple)): + self._groups.extend(channel_groups) + else: + self._groups.extend(utils.split_items(channel_groups)) + + return self + + def build_params(self): + params = self.default_params() + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items(self._groups) + + return params + + def build_path(self): + return Leave.LEAVE_PATH % (self.pubnub.config.subscribe_key, utils.join_channels(self._channels)) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if len(self._channels) == 0 and len(self._groups) == 0: + raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) + + def create_response(self, envelope): + return envelope + + def affected_channels(self): + return self._channels + + def affected_channels_groups(self): + return self._groups + + def operation_type(self): + return PNOperationType.PNUnsubscribeOperation + + def name(self): + return "Leave" diff --git a/pubnub/utils.py b/pubnub/utils.py index 6272ef26..2f3c7d61 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -83,6 +83,13 @@ def join_items(items_list): return ",".join(items_list) +def join_channels(items_list): + if len(items_list) == 0: + return "," + else: + return join_items(items_list) + + def build_url(scheme, origin, path, params): return pn_urlunsplit((scheme, origin, path, params, '')) @@ -98,4 +105,3 @@ def synced_func(*args, **kws): urlparse = pn_urlparse parse_qs = pn_parse_qs - diff --git a/tests/functional/test_leave.py b/tests/functional/test_leave.py new file mode 100644 index 00000000..e28baa21 --- /dev/null +++ b/tests/functional/test_leave.py @@ -0,0 +1,128 @@ +import unittest + +from pubnub.endpoints.pubsub.leave import Leave + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestLeave(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_SubscribeUnitTest" + self.leave = Leave(self.pubnub) + + def test_leave_single_channel(self): + self.leave.channels('ch') + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch")) + + self.assertEqual(self.leave.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._channels, ['ch']) + + def test_leave_multiple_channels(self): + self.leave.channels("ch1,ch2,ch3") + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.leave.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._channels, ['ch1', 'ch2', 'ch3']) + + def test_leave_multiple_channels_using_list(self): + self.leave.channels(['ch1', 'ch2', 'ch3']) + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.leave.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._channels, ['ch1', 'ch2', 'ch3']) + + def test_leave_multiple_channels_using_tuple(self): + self.leave.channels(('ch1', 'ch2', 'ch3')) + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.leave.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._channels, ['ch1', 'ch2', 'ch3']) + + def test_leave_single_group(self): + self.leave.channel_groups("gr") + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.leave.build_params(), { + 'channel-group': 'gr', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._groups, ['gr']) + + def test_leave_multiple_groups_using_string(self): + self.leave.channel_groups("gr1,gr2,gr3") + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.leave.build_params(), { + 'channel-group': 'gr1,gr2,gr3', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._groups, ['gr1', 'gr2', 'gr3']) + + def test_leave_multiple_groups_using_list(self): + self.leave.channel_groups(['gr1', 'gr2', 'gr3']) + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.leave.build_params(), { + 'channel-group': 'gr1,gr2,gr3', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + self.assertEqual(self.leave._groups, ['gr1', 'gr2', 'gr3']) + + def test_leave_channels_and_groups(self): + self.leave.channels('ch1,ch2').channel_groups(["gr1", "gr2"]) + + self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH + % (pnconf.subscribe_key, "ch1,ch2")) + + self.assertEqual(self.leave.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'channel-group': 'gr1,gr2', + }) + + self.assertEqual(self.leave._groups, ['gr1', 'gr2']) + self.assertEqual(self.leave._channels, ['ch1', 'ch2']) From dcaa44a754efb539d651f4d8f095024664a7e480 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 16 Jun 2016 00:22:47 -0700 Subject: [PATCH 107/468] Fix PNOperationType enum declaration --- pubnub/enums.py | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/pubnub/enums.py b/pubnub/enums.py index 645b68de..306d1bc3 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -30,26 +30,26 @@ class PNStatusCategory(object): class PNOperationType(object): - PNSubscribeOperation = 1, - PNUnsubscribeOperation = 2, - PNPublishOperation = 3, - PNHistoryOperation = 4, - PNWhereNowOperation = 5, + PNSubscribeOperation = 1 + PNUnsubscribeOperation = 2 + PNPublishOperation = 3 + PNHistoryOperation = 4 + PNWhereNowOperation = 5 - PNHeartbeatOperation = 6, - PNSetStateOperation = 7, - PNAddChannelsToGroupOperation = 8, - PNRemoveChannelsFromGroupOperation = 9, - PNChannelGroupsOperation = 10, - PNRemoveGroupOperation = 11, - PNChannelsForGroupOperation = 12, - PNPushNotificationEnabledChannelsOperation = 13, - PNAddPushNotificationsOnChannelsOperation = 14, - PNRemovePushNotificationsFromChannelsOperation = 15, - PNRemoveAllPushNotificationsOperation = 16, - PNTimeOperation = 17, + PNHeartbeatOperation = 6 + PNSetStateOperation = 7 + PNAddChannelsToGroupOperation = 8 + PNRemoveChannelsFromGroupOperation = 9 + PNChannelGroupsOperation = 10 + PNRemoveGroupOperation = 11 + PNChannelsForGroupOperation = 12 + PNPushNotificationEnabledChannelsOperation = 13 + PNAddPushNotificationsOnChannelsOperation = 14 + PNRemovePushNotificationsFromChannelsOperation = 15 + PNRemoveAllPushNotificationsOperation = 16 + PNTimeOperation = 17 - PNHereNowOperation = 18, - PNGetState = 19, - PNAccessManagerAudit = 20, + PNHereNowOperation = 18 + PNGetState = 19 + PNAccessManagerAudit = 20 PNAccessManagerGrant = 21 From 4c1880146d2ba0a0db447c51cdb2f69220506f30 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 16 Jun 2016 02:43:45 -0700 Subject: [PATCH 108/468] Implement Tornado subscribe loop, resubscribe, unsubscribe --- pubnub/endpoints/endpoint.py | 19 +- pubnub/endpoints/pubsub/subscribe.py | 8 +- pubnub/managers.py | 33 +- pubnub/models/consumer/pubsub.py | 3 +- pubnub/models/server/subscribe.py | 3 +- pubnub/pubnub.py | 6 + pubnub/pubnub_tornado.py | 281 ++++++++++++------ tests/integrational/tornado/test_subscribe.py | 113 +++++++ 8 files changed, 343 insertions(+), 123 deletions(-) create mode 100644 tests/integrational/tornado/test_subscribe.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index feac9044..3f01d67e 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,4 +1,3 @@ -import threading from abc import ABCMeta, abstractmethod from pubnub.enums import PNStatusCategory @@ -18,12 +17,11 @@ class Endpoint(object): def __init__(self, pubnub): self.pubnub = pubnub - # TODO: this is a platform-dependent operation - self._cancellation_event = threading.Event() + self._cancellation_event = None def cancellation_event(self, event): - assert isinstance(event, threading.Event()) self._cancellation_event = event + return self @abstractmethod def build_path(self): @@ -88,16 +86,17 @@ def callback_wrapper(status_category, response, response_info, exception): return self.pubnub.request_async(self.name(), options, callback_wrapper, self._cancellation_event) - def future(self): + def future(self, intermediate_key_future=False): def handler(): self.validate_params() return self.options() - return self.pubnub \ - .request_future(handler, - create_response=self.create_response, - create_status_response=self.create_status_response - ) + return self.pubnub.request_future(intermediate_key_future=intermediate_key_future, + options_func=handler, + create_response=self.create_response, + create_status_response=self.create_status_response, + cancellation_event=self._cancellation_event + ) def deferred(self): def handler(): diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index 8c790b4a..c2c98466 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -27,11 +27,11 @@ def channels(self, channels): return self - def groups(self, groups): - if isinstance(groups, (list, tuple)): - self._groups.extend(groups) + def channel_groups(self, channel_groups): + if isinstance(channel_groups, (list, tuple)): + self._groups.extend(channel_groups) else: - self._groups.extend(utils.split_items(groups)) + self._groups.extend(utils.split_items(channel_groups)) return self diff --git a/pubnub/managers.py b/pubnub/managers.py index bc31c3c5..545d88d3 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -31,13 +31,17 @@ def __init__(self): self._presence_channels = {} self._presence_groups = {} + def is_empty(self): + return len(self._channels) == 0 and len(self._groups) == 0 and\ + len(self._presence_channels) == 0 and len(self._presence_groups) == 0 + def prepare_channel_list(self, include_presence): return StateManager._prepare_membership_list( self._channels, self._presence_channels, include_presence) def prepare_channel_group_list(self, include_presence): return StateManager._prepare_membership_list( - self._channels, self._presence_channels, include_presence) + self._groups, self._presence_groups, include_presence) def adapt_subscribe_builder(self, subscribe_operation): for channel in subscribe_operation.channels: @@ -54,8 +58,8 @@ def adapt_subscribe_builder(self, subscribe_operation): def adapt_unsubscribe_builder(self, unsubscribe_operation): for channel in unsubscribe_operation.channels: - self._channels.pop(channel) - self._presence_channels.pop(channel) + self._channels.pop(channel, None) + self._presence_channels.pop(channel, None) for group in unsubscribe_operation.channel_groups: self._groups.pop(group) @@ -136,6 +140,14 @@ def _message_queue_put(self, message): def _start_subscribe_loop(self): pass + @abstractmethod + def _stop_subscribe_loop(self): + pass + + @abstractmethod + def _send_leave(self, unsubscribe_operation): + pass + def add_listener(self, listener): self._listener_manager.add_listener(listener) @@ -156,8 +168,11 @@ def adapt_unsubscribe_builder(self, unsubscribe_operation): self._subscription_state.adapt_unsubscribe_builder(unsubscribe_operation) - # TODO: invoke leave request with callback - # Leave() + self._send_leave(unsubscribe_operation) + + if self._subscription_state.is_empty(): + self._region = None + self._timetoken = 0 self.reconnect() @synchronized @@ -177,7 +192,7 @@ def _handle_endpoint_call(self, raw_result, status): if not self._subscription_status_announced: pn_status = PNStatus() - pn_status.category = PNStatusCategory.PNConnectedCategory, + pn_status.category = PNStatusCategory.PNConnectedCategory pn_status.status_code = status.status_code pn_status.auth_key = status.auth_key pn_status.operation = status.operation @@ -198,12 +213,6 @@ def _handle_endpoint_call(self, raw_result, status): self._region = int(result.metadata.region) self._start_subscribe_loop() - def _stop_subscribe_loop(self): - sc = self._subscribe_call - - if sc is not None and not sc.is_executed and not sc.is_canceled: - sc.cancel() - # TODO: implement def _stop_heartbeat_timer(self): pass diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index b9fe67d3..5020de25 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -5,7 +5,8 @@ class PNMessageResult(object): def __init__(self, message, subscribed_channel, actual_channel, timetoken, user_metadata=None): assert message is not None assert isinstance(subscribed_channel, six.string_types) - assert isinstance(actual_channel, six.string_types) + if actual_channel is not None: + assert isinstance(actual_channel, six.string_types) assert isinstance(timetoken, six.integer_types) if user_metadata is not None: diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 269b8d3e..8970922e 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -37,7 +37,8 @@ def __init__(self): def from_json(cls, json_input): message = SubscribeMessage() message.shard = json_input['a'] - message.subscription_match = json_input['b'] + if 'b' in json_input: + message.subscription_match = json_input['b'] message.channel = json_input['c'] message.payload = json_input['d'] message.flags = json_input['f'] diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 4a65d27c..d1edebad 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -309,6 +309,12 @@ def callback(raw_result, status): except Exception as e: print("failed", e) + def _stop_subscribe_loop(self): + sc = self._subscribe_call + + if sc is not None and not sc.is_executed and not sc.is_canceled: + sc.cancel() + class NativeSubscribeMessageWorker(SubscribeMessageWorker): def _take_message(self): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 0bd02f5d..95028d72 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,13 +1,17 @@ +import functools import json import logging import time import datetime +from tornado.log import gen_log +from tornado.simple_httpclient import SimpleAsyncHTTPClient +from pubnub.endpoints.pubsub.leave import Leave from . import utils from .workers import SubscribeMessageWorker from .endpoints.pubsub.subscribe import Subscribe from .managers import SubscriptionManager -from .builders import SubscribeBuilder +from .builders import SubscribeBuilder, UnsubscribeBuilder from .enums import PNStatusCategory from .structures import ResponseInfo from .exceptions import PubNubException @@ -19,12 +23,49 @@ import tornado.gen from tornado.concurrent import Future from tornado.queues import Queue -from tornado.locks import Event +from tornado.locks import Event, Semaphore from tornado import ioloop logger = logging.getLogger("pubnub") +class TornadoCurlAsyncHTTPClient(SimpleAsyncHTTPClient): + def reset_request(self, key_object): + if key_object in self.waiting: + self.io_loop.add_callback(self._on_timeout, key_object) + + def fetch_impl(self, request, initial_callback): + key = object() + + def after_key_callback(callback): + self.queue.append((key, request, callback)) + if not len(self.active) < self.max_clients: + timeout_handle = self.io_loop.add_timeout( + self.io_loop.time() + min(request.connect_timeout, + request.request_timeout), + functools.partial(self._on_timeout, key)) + else: + timeout_handle = None + self.waiting[key] = (request, callback, timeout_handle) + self._process_queue() + if self.queue: + gen_log.debug("max_clients limit reached, request queued. " + "%d active, %d queued requests." % ( + len(self.active), len(self.queue))) + + self.io_loop.add_callback(initial_callback, _TornadoKeyResponse(key, after_key_callback)) + + +class _TornadoKeyResponse(object): + def __init__(self, key, after_key_callback): + self.error = None + self.key = key + self.continue_callback = after_key_callback + + +tornado.httpclient.AsyncHTTPClient.configure(TornadoCurlAsyncHTTPClient) + + class PubNubTornado(PubNubCore): def stop(self): self.ioloop.stop() @@ -79,8 +120,9 @@ def subscribe(self): return SubscribeBuilder(self._subscription_manager) def unsubscribe(self): - pass + return UnsubscribeBuilder(self._subscription_manager) + # TODO: extract this into a separate class def request_sync(self, *args): raise NotImplementedError @@ -90,9 +132,30 @@ def request_async(self, *args): def request_deferred(self, *args): raise NotImplementedError - def request_future(self, options_func, create_response, create_status_response): + def request_future(self, intermediate_key_future, options_func, + create_response, create_status_response, cancellation_event): + key_future = self.request_future_key(options_func, + create_response, + create_status_response, + cancellation_event) + if intermediate_key_future: + return key_future + else: + @tornado.gen.coroutine + def cb(): + key, call = yield key_future + blah = yield call + raise tornado.gen.Return(blah) + + return cb() + + def request_future_key(self, options_func, create_response, + create_status_response, cancellation_event): + if cancellation_event is not None: + assert isinstance(cancellation_event, Event) + options = options_func() - future = Future() + key_future = Future() url = utils.build_url(self.config.scheme(), self.config.origin, options.path, options.query_string) @@ -106,88 +169,100 @@ def request_future(self, options_func, create_response, create_status_response): connect_timeout=self.config.connect_timeout, request_timeout=self.config.non_subscribe_request_timeout) - def response_callback(response): - body = response.body - response_info = None - status_category = PNStatusCategory.PNUnknownCategory - - if response is not None: - request_url = utils.urlparse(response.effective_url) - query = utils.parse_qs(request_url.query) - uuid = None - auth_key = None - - if 'uuid' in query and len(query['uuid']) > 0: - uuid = query['uuid'][0] - - if 'auth_key' in query and len(query['auth_key']) > 0: - auth_key = query['auth_key'][0] - - response_info = ResponseInfo( - status_code=response.code, - tls_enabled='https' == request_url.scheme, - origin=request_url.hostname, - uuid=uuid, - auth_key=auth_key, - client_request=response.request - ) - - if body is not None and len(body) > 0: - try: - data = json.loads(body) - except TypeError: - try: - data = json.loads(body.decode("utf-8")) - except ValueError: - tornado_result = TornadoEnvelope( - create_response(None), - create_status_response(status_category, response, response_info, PubNubException( - pn_error=PNERR_JSON_DECODING_FAILED, - errormsg='json decode error') - ) - ) - future.set_exception(tornado_result) - return - else: - data = "N/A" + def key_callback(key_response): + future = Future() + key_future.set_result((key_response.key, future)) - if response.error is not None: - if response.code >= 500: - err = PNERR_SERVER_ERROR + def response_callback(response): + if cancellation_event is not None and cancellation_event.is_set(): + return + + body = response.body + response_info = None + status_category = PNStatusCategory.PNUnknownCategory + + if response is not None: + request_url = utils.urlparse(response.effective_url) + query = utils.parse_qs(request_url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=response.code, + tls_enabled='https' == request_url.scheme, + origin=request_url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=response.request + ) + + if body is not None and len(body) > 0: + try: + data = json.loads(body) + except TypeError: + try: + data = json.loads(body.decode("utf-8")) + except ValueError: + tornado_result = TornadoEnvelope( + create_response(None), + create_status_response(status_category, response, response_info, PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error') + ) + ) + future.set_exception(tornado_result) + return else: - err = PNERR_CLIENT_ERROR - - if response.code == 403: - status_category = PNStatusCategory.PNAccessDeniedCategory - - if response.code == 400: - status_category = PNStatusCategory.PNBadRequestCategory - - if response.code == 599: - status_category = PNStatusCategory.PNTimeoutCategory - - future.set_exception(PubNubTornadoException( - result=data, - status=create_status_response(status_category, data, response_info, - PubNubException( - errormsg=data, - pn_error=err, - status_code=response.code, - )) - )) - else: - future.set_result(TornadoEnvelope( - result=create_response(data), - status=create_status_response(status_category, data, response_info, None) - ) - ) + data = "N/A" + + if response.error is not None: + if response.code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + if response.code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if response.code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if response.code == 599: + status_category = PNStatusCategory.PNTimeoutCategory + + future.set_exception(PubNubTornadoException( + result=data, + status=create_status_response(status_category, data, response_info, + PubNubException( + errormsg=data, + pn_error=err, + status_code=response.code, + )) + )) + else: + future.set_result(TornadoEnvelope( + result=create_response(data), + status=create_status_response( + PNStatusCategory.PNAcknowledgmentCategory, + data, + response_info, + None) + )) + + key_response.continue_callback(response_callback) self.http.fetch( request=request, - callback=response_callback + callback=key_callback ) - return future + return key_future class TornadoSubscribeMessageWorker(SubscribeMessageWorker): @@ -205,19 +280,21 @@ def _take_message(self): self._process_incoming_payload(msg) self._queue.task_done() except tornado.gen.TimeoutError: - print("%d continue" % i) i += 1 continue - # TODO: should context of callback be changed? - # except Exception as e: - # print("!!! ex") - # break + # TODO: should context of callback be changed to not affect on this loop? + # errors are skipped for now + # TODO:check http://www.tornadoweb.org/en/stable/ioloop.html#tornado.ioloop.IOLoop.handle_callback_exception + except Exception as e: + print("!!! ex", str(e)) class TornadoSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): self._message_queue = Queue() self._consumer_event = Event() + self._subscription_lock = Semaphore(1) + self._current_request_key_object = None super(TornadoSubscriptionManager, self).__init__(pubnub_instance) def _set_consumer_event(self): @@ -230,11 +307,13 @@ def _start_worker(self): self._consumer = TornadoSubscribeMessageWorker(self._pubnub, self._listener_manager, self._message_queue, self._consumer_event) - self._pubnub.ioloop.add_callback(self._consumer.run) + self._pubnub.ioloop.spawn_callback(self._consumer.run) @tornado.gen.coroutine def _start_subscribe_loop(self): self._stop_subscribe_loop() + yield self._subscription_lock.acquire() + cancellation_event = Event() combined_channels = self._subscription_state.prepare_channel_list(True) combined_groups = self._subscription_state.prepare_channel_group_list(True) @@ -243,23 +322,35 @@ def _start_subscribe_loop(self): return try: - envelope = yield Subscribe(self._pubnub) \ - .channels(combined_channels).groups(combined_groups) \ + key_object, subscribe = yield Subscribe(self._pubnub) \ + .channels(combined_channels).channel_groups(combined_groups) \ .timetoken(self._timetoken).region(self._region) \ .filter_expression(self._pubnub.config.filter_expression) \ - .future() + .cancellation_event(cancellation_event) \ + .future(intermediate_key_future=True) + + self._current_request_key_object = key_object + envelope = yield subscribe + + self._handle_endpoint_call(envelope.result, envelope.status) except PubNubTornadoException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: - yield self._start_subscribe_loop() + self._start_subscribe_loop() else: self._listener_manager.announce_status(e.status) + finally: + cancellation_event.set() + self._subscription_lock.release() - return - except Exception as e: - print("!!! ex2", e) - return + def _stop_subscribe_loop(self): + self._pubnub.http.reset_request(self._current_request_key_object) - self._handle_endpoint_call(envelope.result, envelope.status) + @tornado.gen.coroutine + def _send_leave(self, unsubscribe_operation): + envelope = yield Leave(self._pubnub) \ + .channels(unsubscribe_operation.channels) \ + .channel_groups(unsubscribe_operation.channel_groups).future() + self._listener_manager.announce_status(envelope.status) class TornadoEnvelope(object): diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py new file mode 100644 index 00000000..925c86f2 --- /dev/null +++ b/tests/integrational/tornado/test_subscribe.py @@ -0,0 +1,113 @@ +import logging +import pubnub as pn + +from tornado.testing import AsyncTestCase +from pubnub.callbacks import SubscribeCallback +from pubnub.enums import PNStatusCategory, PNOperationType +from pubnub.models.consumer.common import PNStatus +from pubnub.pubnub_tornado import PubNubTornado +from tests.helper import pnconf + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch1 = "ch1" +ch2 = "ch2" + + +def is_subscribed_event(status): + assert isinstance(status, PNStatus) + return status.category == PNStatusCategory.PNConnectedCategory + + +def is_unsubscribed_event(status): + assert isinstance(status, PNStatus) + return status.category == PNStatusCategory.PNAcknowledgmentCategory \ + and status.operation == PNOperationType.PNUnsubscribeOperation + + +class SubscriptionTest(object): + def __init__(self): + super(SubscriptionTest, self).__init__() + self.pubnub = None + + +class TestMultipleChannelSubscriptions(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestMultipleChannelSubscriptions, self).setUp() + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + + def test_do(self): + _test = self + + class MyCallback(SubscribeCallback): + def __init__(self): + self.subscribe = False + self.unsubscribe = False + + def message(self, pubnub, result): + _test.io_loop.add_callback(_test._unsubscribe) + + def status(self, pubnub, status): + # connect event triggers only once, but probably should be triggered once for each channel + # TODO collect 3 subscribe + # TODO collect 3 unsubscribe + if is_subscribed_event(status): + self.subscribe = True + _test.io_loop.add_callback(_test._publish) + elif is_unsubscribed_event(status): + self.unsubscribe = True + pubnub.stop() + _test.stop() + + def presence(self, pubnub, presence): + pass + + callback = MyCallback() + self.pubnub.add_listener(callback) + self.pubnub.subscribe().channels("ch1").execute() + self.pubnub.subscribe().channels("ch2").execute() + self.pubnub.subscribe().channels("ch3").execute() + + self.wait() + + def _publish(self): + self.pubnub.publish().channel("ch2").message("hey").future() + + def _unsubscribe(self): + self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() + self.io_loop.add_callback(self._unsubscribe2) + + def _unsubscribe2(self): + self.pubnub.unsubscribe().channels(["ch3"]).execute() + + +class TestSubscribeUnsubscribe(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestSubscribeUnsubscribe, self).setUp() + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + + def test_do(self): + _test = self + + class MyCallback(SubscribeCallback): + def message(self, pubnub, result): + pass + + def status(self, pubnub, status): + if is_subscribed_event(status): + _test.io_loop.add_callback(_test._unsubscribe) + elif is_unsubscribed_event(status): + pubnub.stop() + _test.stop() + + def presence(self, pubnub, presence): + pass + + callback = MyCallback() + self.pubnub.add_listener(callback) + self.pubnub.subscribe().channels("ch1").execute() + self.pubnub.start() + self.wait() + + def _unsubscribe(self): + self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() From 46532deb8506057bcfd8eb4859b7f2b270afc7a1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 16 Jun 2016 02:51:51 -0700 Subject: [PATCH 109/468] Update tests with changed Subscribe.groups => Subscribe.channel_groups method --- tests/functional/test_subscribe.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_subscribe.py b/tests/functional/test_subscribe.py index a5326ea0..2f6bead8 100644 --- a/tests/functional/test_subscribe.py +++ b/tests/functional/test_subscribe.py @@ -73,7 +73,7 @@ def test_sub_multiple_channels_using_tuple(self): self.assertEqual(self.sub._channels, ['ch1', 'ch2', 'ch3']) def test_sub_single_group(self): - self.sub.groups("gr") + self.sub.channel_groups("gr") self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, ",")) @@ -87,7 +87,7 @@ def test_sub_single_group(self): self.assertEqual(self.sub._groups, ['gr']) def test_sub_multiple_groups_using_string(self): - self.sub.groups("gr1,gr2,gr3") + self.sub.channel_groups("gr1,gr2,gr3") self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, ",")) @@ -101,7 +101,7 @@ def test_sub_multiple_groups_using_string(self): self.assertEqual(self.sub._groups, ['gr1', 'gr2', 'gr3']) def test_sub_multiple_groups_using_list(self): - self.sub.groups(['gr1', 'gr2', 'gr3']) + self.sub.channel_groups(['gr1', 'gr2', 'gr3']) self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, ",")) From a575fef265930a21c1390ae62b8fd80b0b7ec89c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 16 Jun 2016 02:58:05 -0700 Subject: [PATCH 110/468] Fix python 2.7 import --- pubnub/pubnub_tornado.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 95028d72..aceef3cb 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -6,8 +6,8 @@ from tornado.log import gen_log from tornado.simple_httpclient import SimpleAsyncHTTPClient -from pubnub.endpoints.pubsub.leave import Leave from . import utils +from .endpoints.pubsub.leave import Leave from .workers import SubscribeMessageWorker from .endpoints.pubsub.subscribe import Subscribe from .managers import SubscriptionManager From 7c82e8c74330624a360d2cc2f0b59915b3d08b47 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 16 Jun 2016 03:04:06 -0700 Subject: [PATCH 111/468] Add tornado to exceptions for python 2.6 --- scripts/run-tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 5a1669e9..fceebd74 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -23,5 +23,7 @@ def run(command): if version.startswith('2.7'): run('py.test --cov=../pubnub') +elif version.startswith('2.6'): + run('py.test --cov=../pubnub --ignore=integrational/tornado/ --ignore=integrational/twisted/') else: run('py.test --cov=../pubnub/ --ignore=integrational/twisted/') From 3a689d056e4bef342b790a64387321beaeebb46f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 17 Jun 2016 04:30:48 -0700 Subject: [PATCH 112/468] Add tornado subscription benchmark --- tests/benchmarks/__init__.py | 0 .../tornado/test_bm_subscription.py | 69 +++++++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 tests/benchmarks/__init__.py create mode 100644 tests/benchmarks/tornado/test_bm_subscription.py diff --git a/tests/benchmarks/__init__.py b/tests/benchmarks/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/benchmarks/tornado/test_bm_subscription.py b/tests/benchmarks/tornado/test_bm_subscription.py new file mode 100644 index 00000000..df682d79 --- /dev/null +++ b/tests/benchmarks/tornado/test_bm_subscription.py @@ -0,0 +1,69 @@ +import logging + +import tornado.gen +import tornado.locks +import tornado.ioloop + +import pubnub as pn + +from pubnub.callbacks import SubscribeCallback +from pubnub.pubnub_tornado import PubNubTornado +from tests.helper import pnconf + +io_loop = tornado.ioloop.IOLoop.instance() +connected = tornado.locks.Event() + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch = "ch-bench" +count = 10 + + +class SubscriptionBenchmarkListener(SubscribeCallback): + def __init__(self): + self.i = 0 + self.event = None + + def status(self, pubnub, status): + connected.set() + + def presence(self, pubnub, presence): + pass + + def message(self, pubnub, response): + print("message#%d" % self.i) + assert response.message == "hey-%d" % self.i + self.i += 1 + self.event.set() + + def set_event(self, event): + self.event = event + +pubnub = PubNubTornado(pnconf, custom_ioloop=io_loop) +callback = SubscriptionBenchmarkListener() +pubnub.add_listener(callback) +pubnub.subscribe().channels(ch).execute() +connected.wait() + + +@tornado.gen.coroutine +def publish(i): + yield pubnub.publish().channel(ch).message("hey-%d" % i).future() + + +@tornado.gen.coroutine +def cycle(): + event = tornado.locks.Event() + io_loop.add_callback(publish, callback.i) + callback.set_event(event) + yield event.wait() + + +def runner(): + io_loop.run_sync(cycle) + + +def test_subscription_benchmark(benchmark): + benchmark(runner) + pubnub.stop() + io_loop.stop() From b62d7e7c626492bfc546e6fd0154580db8a2e648 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 17 Jun 2016 04:31:17 -0700 Subject: [PATCH 113/468] Add pytest-benchmark to requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 61189bd0..01725db8 100755 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ codecov tornado vcrpy pycrypto +pytest-benchmark \ No newline at end of file From 4c5852b51280ee308b5d6796b274ed4d5e4b5b9c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 17 Jun 2016 04:33:03 -0700 Subject: [PATCH 114/468] Move subscription event assertions to tests helper --- tests/helper.py | 13 +++++++++++ tests/integrational/tornado/test_subscribe.py | 22 +++++-------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/tests/helper.py b/tests/helper.py index 01e5f055..69f0d8ba 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,6 +1,8 @@ import threading from pubnub import utils +from pubnub.enums import PNOperationType, PNStatusCategory +from pubnub.models.consumer.common import PNStatus from pubnub.pnconfiguration import PNConfiguration @@ -34,6 +36,17 @@ def url_encode(data): return utils.url_encode(utils.write_value_as_string(data)) +def is_subscribed_event(status): + assert isinstance(status, PNStatus) + return status.category == PNStatusCategory.PNConnectedCategory + + +def is_unsubscribed_event(status): + assert isinstance(status, PNStatus) + return status.category == PNStatusCategory.PNAcknowledgmentCategory \ + and status.operation == PNOperationType.PNUnsubscribeOperation + + class CountDownLatch(object): def __init__(self, count=1): self.count = count diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 925c86f2..afd30c8b 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -3,9 +3,8 @@ from tornado.testing import AsyncTestCase from pubnub.callbacks import SubscribeCallback -from pubnub.enums import PNStatusCategory, PNOperationType -from pubnub.models.consumer.common import PNStatus from pubnub.pubnub_tornado import PubNubTornado +from tests import helper from tests.helper import pnconf pn.set_stream_logger('pubnub', logging.DEBUG) @@ -14,17 +13,6 @@ ch2 = "ch2" -def is_subscribed_event(status): - assert isinstance(status, PNStatus) - return status.category == PNStatusCategory.PNConnectedCategory - - -def is_unsubscribed_event(status): - assert isinstance(status, PNStatus) - return status.category == PNStatusCategory.PNAcknowledgmentCategory \ - and status.operation == PNOperationType.PNUnsubscribeOperation - - class SubscriptionTest(object): def __init__(self): super(SubscriptionTest, self).__init__() @@ -51,10 +39,10 @@ def status(self, pubnub, status): # connect event triggers only once, but probably should be triggered once for each channel # TODO collect 3 subscribe # TODO collect 3 unsubscribe - if is_subscribed_event(status): + if helper.is_subscribed_event(status): self.subscribe = True _test.io_loop.add_callback(_test._publish) - elif is_unsubscribed_event(status): + elif helper.is_unsubscribed_event(status): self.unsubscribe = True pubnub.stop() _test.stop() @@ -94,9 +82,9 @@ def message(self, pubnub, result): pass def status(self, pubnub, status): - if is_subscribed_event(status): + if helper.is_subscribed_event(status): _test.io_loop.add_callback(_test._unsubscribe) - elif is_unsubscribed_event(status): + elif helper.is_unsubscribed_event(status): pubnub.stop() _test.stop() From 3edab1b878d55cbb5194153745f20751c77630f7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 17 Jun 2016 06:57:48 -0700 Subject: [PATCH 115/468] Add here_now functional tests --- pubnub/endpoints/presence/herenow.py | 26 +++++++----- pubnub/utils.py | 9 +++++ tests/functional/test_herenow.py | 59 ++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 10 deletions(-) create mode 100644 tests/functional/test_herenow.py diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 358764e1..d5a64e81 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -1,3 +1,4 @@ +from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.enums import HttpMethod, PNOperationType from pubnub.models.consumer.presence import PNHereNowResult, PNOccupantsData, PNHereNowChannelData @@ -12,36 +13,41 @@ def __init__(self, pubnub): self._channels = [] self._channel_groups = [] self._include_state = False + self._include_uuids = True def channels(self, channels): - self._channels = channels + utils.extend_list(self._channels, channels) return self def channel_groups(self, channel_groups): - self._channel_groups = channel_groups + utils.extend_list(self._channel_groups, channel_groups) return self def include_state(self, should_include_state): self._include_state = should_include_state return self + def include_uuids(self, include_uuids): + self._include_uuids= include_uuids + return self + def build_params(self): params = self.default_params() if len(self._channel_groups) > 0: - params['channel-groups'] = ",".join(self._channels) + params['channel-groups'] = utils.join_items(self._channel_groups) + + if self._include_state: + params['state'] = "1" - params['state'] = "1" + if not self._include_uuids: + params['disable_uuids'] = "1" return params def build_path(self): - if len(self._channels) > 0: - channels = ','.join(self._channels) - else: - channels = ',' - - return HereNow.HERE_NOW_PATH % (self.pubnub.config.subscribe_key, channels) + return HereNow.HERE_NOW_PATH % (self.pubnub.config.subscribe_key, + utils.join_channels(self._channels)) def http_method(self): return HttpMethod.GET diff --git a/pubnub/utils.py b/pubnub/utils.py index 2f3c7d61..66599f52 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -2,6 +2,8 @@ import uuid as u import threading +import six + from .errors import PNERR_JSON_NOT_SERIALIZABLE from .exceptions import PubNubException @@ -90,6 +92,13 @@ def join_channels(items_list): return join_items(items_list) +def extend_list(existing_items, new_items): + if isinstance(new_items, six.string_types): + existing_items.extend(split_items(new_items)) + else: + existing_items.extend(new_items) + + def build_url(scheme, origin, path, params): return pn_urlunsplit((scheme, origin, path, params, '')) diff --git a/tests/functional/test_herenow.py b/tests/functional/test_herenow.py new file mode 100644 index 00000000..c4e69829 --- /dev/null +++ b/tests/functional/test_herenow.py @@ -0,0 +1,59 @@ +import unittest + +from pubnub.endpoints.presence.herenow import HereNow + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestHereNow(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name + ) + self.pubnub.uuid = "UUID_HereNowTest" + self.here_now = HereNow(self.pubnub) + + def test_here_now(self): + self.here_now.channels("ch1") + + self.assertEquals(self.here_now.build_path(), HereNow.HERE_NOW_PATH + % (pnconf.subscribe_key, "ch1")) + + self.assertEqual(self.here_now.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + def test_here_now_groups(self): + self.here_now.channel_groups("gr1") + + self.assertEquals(self.here_now.build_path(), HereNow.HERE_NOW_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.here_now.build_params(), { + 'channel-groups': 'gr1', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) + + def test_here_now_with_options(self): + self.here_now.channels(["ch1"]).channel_groups("gr1").include_state(True).include_uuids(False) + + self.assertEquals(self.here_now.build_path(), HereNow.HERE_NOW_PATH + % (pnconf.subscribe_key, "ch1")) + + self.assertEqual(self.here_now.build_params(), { + 'channel-groups': 'gr1', + 'state': '1', + 'disable_uuids': '1', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) From e30ef1cde94c4b37a6c4019545313e06e994efa0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 17 Jun 2016 10:11:15 -0700 Subject: [PATCH 116/468] Add functional torando here_now test --- pubnub/endpoints/presence/herenow.py | 24 +------ pubnub/models/consumer/presence.py | 32 +++++++++- tests/helper.py | 12 ++++ tests/integrational/tornado/test_here_now.py | 67 ++++++++++++++++++-- 4 files changed, 105 insertions(+), 30 deletions(-) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index d5a64e81..0df6fd62 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -65,29 +65,7 @@ def parse_single_channel_response(self, envelope): return "qwer" def parse_multiple_channel_response(self, envelope): - """ - :param envelope: an already serialized json response - :return: - """ - - payload = envelope['payload'] - raw_channels = payload['channels'] - channels = [] - - for raw_channel, raw_data in raw_channels.items(): - occupants = [] - for uuid, state in raw_data.items(): - occupants.append(PNOccupantsData(uuid, state)) - - channels.append(PNHereNowChannelData( - channel_name=raw_channel, - occupancy=int(raw_data['occupancy']), - occupants=occupants - )) - - res = PNHereNowResult(int(payload['total_channels']), int(payload['total_channels']), channels) - - return res + return PNHereNowResult.from_json(envelope['payload']) def operation_type(self): return PNOperationType.PNPublishOperation diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index d93a1376..3caaec91 100755 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -1,9 +1,22 @@ +import six + + class PNHereNowResult(object): def __init__(self, total_channels, total_occupancy, channels): + assert isinstance(total_channels, six.integer_types) + assert isinstance(total_occupancy, six.integer_types) + self.total_channels = total_channels self.total_occupancy = total_occupancy self.channels = channels + @classmethod + def from_json(self, json_input): + channels = [] + for raw_channel, raw_data in json_input['channels'].items(): + channels.append(PNHereNowChannelData.from_json(raw_channel, raw_data)) + return PNHereNowResult(int(json_input['total_channels']), int(json_input['total_occupancy']), channels) + class PNHereNowChannelData(object): def __init__(self, channel_name, occupancy, occupants): @@ -11,8 +24,25 @@ def __init__(self, channel_name, occupancy, occupants): self.occupancy = occupancy self.occupants = occupants + @classmethod + def from_json(cls, name, json_input): + occupants = [] + + if isinstance(json_input['uuids'], list): + for uuid in json_input['uuids']: + occupants.append(PNOccupantsData(uuid, None)) + elif isinstance(json_input['uuids'], dict): + for uuid, state in json_input['uuids'].items(): + occupants.append(PNOccupantsData(uuid, state)) + + return PNHereNowChannelData( + channel_name=name, + occupancy=int(json_input['occupancy']), + occupants=occupants + ) + class PNOccupantsData(object): def __init__(self, uuid, state): - self.uuid = uuid, + self.uuid = uuid self.state = state diff --git a/tests/helper.py b/tests/helper.py index 69f0d8ba..8438863d 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,5 +1,9 @@ import threading +import string + +import random + from pubnub import utils from pubnub.enums import PNOperationType, PNStatusCategory from pubnub.models.consumer.common import PNStatus @@ -36,6 +40,14 @@ def url_encode(data): return utils.url_encode(utils.write_value_as_string(data)) +def gen_channel(prefix): + return "%s-%s" % (prefix, gen_string(8)) + + +def gen_string(l): + return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(l)) + + def is_subscribed_event(status): assert isinstance(status, PNStatus) return status.category == PNStatusCategory.PNConnectedCategory diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index c11c649d..ab96837a 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -1,22 +1,77 @@ import tornado +from tornado import gen +from tornado.locks import Event from tornado.testing import AsyncHTTPTestCase, AsyncTestCase + +from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado +from tests import helper from tests.helper import pnconf +class ConnectionEvent(SubscribeCallback): + def __init__(self, event, expected_status_checker): + self.event = event + self.expected_status_checker = expected_status_checker + + def status(self, pubnub, status): + if self.expected_status_checker(status): + self.event.set() + + def presence(self, pubnub, presence): + pass + + def message(self, pubnub, message): + pass + + +@tornado.gen.coroutine +def connect_to_channel(pubnub, channel): + event = Event() + callback = ConnectionEvent(event, helper.is_subscribed_event) + pubnub.add_listener(callback) + pubnub.subscribe().channels(channel).execute() + yield event.wait() + + +@tornado.gen.coroutine +def disconnect_from_channel(pubnub, channel): + event = Event() + callback = ConnectionEvent(event, helper.is_unsubscribed_event) + pubnub.add_listener(callback) + pubnub.unsubscribe().channels(channel).execute() + yield event.wait() + + class TestPubNubAsyncHereNow(AsyncTestCase): + def setUp(self): + super(TestPubNubAsyncHereNow, self).setUp() + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + @tornado.testing.gen_test def test_success(self): - pubnub = PubNubTornado(pnconf) - pubnub.set_ioloop(self.io_loop) - - env = yield pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ + ch1 = helper.gen_channel("here-now") + ch2 = helper.gen_channel("here-now") + yield connect_to_channel(self.pubnub, [ch1, ch2]) + yield gen.sleep(2) + env = yield self.pubnub.here_now() \ + .channels([ch1, ch2]) \ .include_state(False) \ .future() print(env.result) + assert env.result.total_channels == 2 + assert env.result.total_occupancy >= 1 + + channels = env.result.channels + + assert len(channels) == 2 + assert channels[0].occupancy == 1 + assert channels[0].occupants[0].uuid == self.pubnub.uuid + assert channels[1].occupancy == 1 + assert channels[1].occupants[0].uuid == self.pubnub.uuid - pubnub.stop() + yield disconnect_from_channel(self.pubnub, [ch1, ch2]) + self.pubnub.stop() self.stop() From 0195c740b1aae1cabcc446e8c395c7ffaa08dd61 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 21 Jun 2016 05:54:53 -0700 Subject: [PATCH 117/468] Working on here_now implementation --- pubnub/endpoints/presence/herenow.py | 13 +++-- pubnub/models/consumer/presence.py | 35 +++++++++--- tests/integrational/tornado/test_here_now.py | 30 ++++++++++- tests/unit/test_herenow.py | 56 ++++++++++++++++++++ 4 files changed, 121 insertions(+), 13 deletions(-) create mode 100644 tests/unit/test_herenow.py diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 0df6fd62..784ded64 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -1,7 +1,7 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.enums import HttpMethod, PNOperationType -from pubnub.models.consumer.presence import PNHereNowResult, PNOccupantsData, PNHereNowChannelData +from pubnub.models.consumer.presence import PNHereNowResult, PNHereNowOccupantsData, PNHereNowChannelData class HereNow(Endpoint): @@ -62,10 +62,17 @@ def create_response(self, envelope): return self.parse_single_channel_response(envelope) def parse_single_channel_response(self, envelope): - return "qwer" + channels = None + occupants = None + if self._include_uuids: + channels = [PNHereNowChannelData(self._channels[0], + envelope['occupancy'], + occupants)] + + return PNHereNowChannelData(1, int(envelope['total_occupancy']), channels) def parse_multiple_channel_response(self, envelope): - return PNHereNowResult.from_json(envelope['payload']) + return PNHereNowResult.from_json(envelope) def operation_type(self): return PNOperationType.PNPublishOperation diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index 3caaec91..dce9617a 100755 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -11,11 +11,30 @@ def __init__(self, total_channels, total_occupancy, channels): self.channels = channels @classmethod - def from_json(self, json_input): - channels = [] - for raw_channel, raw_data in json_input['channels'].items(): - channels.append(PNHereNowChannelData.from_json(raw_channel, raw_data)) - return PNHereNowResult(int(json_input['total_channels']), int(json_input['total_occupancy']), channels) + def from_json(cls, envelope, channels): + # multiple + if 'channels' in envelope and isinstance(envelope['channels'], dict): + json_input = envelope['payload'] + channels = [] + + for channel_name, raw_data in json_input['channels'].items(): + channels.append(PNHereNowChannelData.from_json(channel_name, raw_data)) + return PNHereNowResult(int(json_input['total_channels']), int(json_input['total_occupancy']), channels) + # empty + elif 'occupancy' in envelope and int(envelope['occupancy']) == 0: + return PNHereNowResult(int(1), int(envelope['occupancy']), []) + # single + elif 'uuids' in envelope and isinstance(envelope['uuids'], list): + occupants = [] + for uuid in envelope['uuids']: + occupants.append( + PNHereNowOccupantsData(channels[0], uuid)) + + channels = [PNHereNowChannelData(channels[0], + envelope['occupancy'], + occupants)] + + return PNHereNowResult(1, int(envelope['occupancy']), channels) class PNHereNowChannelData(object): @@ -30,10 +49,10 @@ def from_json(cls, name, json_input): if isinstance(json_input['uuids'], list): for uuid in json_input['uuids']: - occupants.append(PNOccupantsData(uuid, None)) + occupants.append(PNHereNowOccupantsData(uuid, None)) elif isinstance(json_input['uuids'], dict): for uuid, state in json_input['uuids'].items(): - occupants.append(PNOccupantsData(uuid, state)) + occupants.append(PNHereNowOccupantsData(uuid, state)) return PNHereNowChannelData( channel_name=name, @@ -42,7 +61,7 @@ def from_json(cls, name, json_input): ) -class PNOccupantsData(object): +class PNHereNowOccupantsData(object): def __init__(self, uuid, state): self.uuid = uuid self.state = state diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index ab96837a..449e5d1e 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -49,14 +49,40 @@ def setUp(self): self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) @tornado.testing.gen_test - def test_success(self): + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + yield connect_to_channel(self.pubnub, ch) + yield gen.sleep(2) + env = yield self.pubnub.here_now() \ + .channels(ch) \ + .include_uuids(True) \ + .future() + + print(env.result) + assert env.result.total_channels == 2 + assert env.result.total_occupancy >= 1 + + channels = env.result.channels + + assert len(channels) == 2 + assert channels[0].occupancy == 1 + assert channels[0].occupants[0].uuid == self.pubnub.uuid + assert channels[1].occupancy == 1 + assert channels[1].occupants[0].uuid == self.pubnub.uuid + + yield disconnect_from_channel(self.pubnub, ch) + self.pubnub.stop() + self.stop() + + @tornado.testing.gen_test + def test_multiple_channels(self): ch1 = helper.gen_channel("here-now") ch2 = helper.gen_channel("here-now") yield connect_to_channel(self.pubnub, [ch1, ch2]) yield gen.sleep(2) env = yield self.pubnub.here_now() \ .channels([ch1, ch2]) \ - .include_state(False) \ + .include_uuids(False) \ .future() print(env.result) diff --git a/tests/unit/test_herenow.py b/tests/unit/test_herenow.py new file mode 100644 index 00000000..72c9296a --- /dev/null +++ b/tests/unit/test_herenow.py @@ -0,0 +1,56 @@ +import unittest + +from pubnub.models.consumer.presence import PNHereNowResult + +empty = {'service': 'Presence', 'status': 200, 'message': 'OK', 'occupancy': 0, 'uuids': []} +empty_disable_uuids = {'message': 'OK', 'occupancy': 0, 'status': 200, 'service': 'Presence'} + +single = {'status': 200, 'message': 'OK', 'service': 'Presence', 'occupancy': 1, + 'uuids': ['08c36f36-7b00-41c9-b101-d07b19bc30cb']} +single_disable_uuids = {'service': 'Presence', 'occupancy': 1, 'message': 'OK', 'status': 200} +single_with_state = {'uuids': [{'uuid': 'c190fbdc-dcde-4553-9085-85f8dedf76e4'}], 'status': 200, 'occupancy': 1, + 'service': 'Presence', 'message': 'OK'} + +multiple = {'status': 200, 'message': 'OK', 'payload': {'total_channels': 2, 'channels': { + 'here-now-GIY92DGX': {'occupancy': 1, 'uuids': ['c71b2961-9624-4801-90bc-6c89a725a422']}, + 'here-now-B1WZA4LO': {'occupancy': 1, 'uuids': ['c71b2961-9624-4801-90bc-6c89a725a422']}}, 'total_occupancy': 2}, + 'service': 'Presence'} +multiple_with_state_disable_uuids = { + 'payload': {'channels': {'here-now-IUX5HV7O': {'occupancy': 1}, 'here-now-FGE5Q9UY': {'occupancy': 1}}, + 'total_occupancy': 2, 'total_channels': 2}, 'message': 'OK', 'service': 'Presence', 'status': 200} +multiple_with_state = {'payload': {'total_occupancy': 2, 'channels': { + 'here-now-16IAN0F9': {'occupancy': 1, 'uuids': [{'uuid': 'd66b4e96-8972-4f1d-9942-46dd60947d85'}]}, + 'here-now-249XRUPW': {'occupancy': 1, 'uuids': [{'uuid': 'd66b4e96-8972-4f1d-9942-46dd60947d85'}]}}, + 'total_channels': 2}, 'service': 'Presence', 'status': 200, 'message': 'OK'} + + +class TestHereNowResultGenerator(unittest.TestCase): + def test_empty(self): + channel_names = ['blah'] + response = PNHereNowResult.from_json(empty, channel_names) + channels = response.channels + + assert response.total_channels == 1 + assert response.total_occupancy == 0 + assert isinstance(channels, list) + assert len(channels) == 0 + + def test_empty_disable_uuids(self): + channel_names = ['blah'] + response = PNHereNowResult.from_json(empty_disable_uuids, channel_names) + channels = response.channels + + assert response.total_channels == 1 + assert response.total_occupancy == 0 + assert isinstance(channels, list) + assert len(channels) == 0 + + def test_single(self): + channel_names = ['blah'] + response = PNHereNowResult.from_json(single, channel_names) + channels = response.channels + + assert response.total_channels == 1 + assert response.total_occupancy == 0 + assert isinstance(channels, list) + assert len(channels) == 0 \ No newline at end of file From 9caf51be2577ff4136e7c9374279074c430eda72 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 21 Jun 2016 08:45:49 -0700 Subject: [PATCH 118/468] Add state getter and setter --- pubnub/endpoints/endpoint.py | 6 +- pubnub/endpoints/pubsub/get_state.py | 65 +++++++++++++++ pubnub/endpoints/pubsub/set_state.py | 72 +++++++++++++++++ pubnub/errors.py | 1 + pubnub/models/consumer/presence.py | 12 +++ pubnub/pubnub_tornado.py | 8 ++ tests/functional/test_get_state.py | 53 ++++++++++++ tests/functional/test_set_state.py | 57 +++++++++++++ tests/integrational/tornado/test_set_state.py | 80 +++++++++++++++++++ 9 files changed, 353 insertions(+), 1 deletion(-) create mode 100644 pubnub/endpoints/pubsub/get_state.py create mode 100644 pubnub/endpoints/pubsub/set_state.py create mode 100644 tests/functional/test_get_state.py create mode 100644 tests/functional/test_set_state.py create mode 100644 tests/integrational/tornado/test_set_state.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 3f01d67e..e6655c8e 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,7 +1,7 @@ from abc import ABCMeta, abstractmethod from pubnub.enums import PNStatusCategory -from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING +from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pn_error_data import PNErrorData @@ -118,6 +118,10 @@ def validate_subscribe_key(self): if self.pubnub.config.subscribe_key is None or len(self.pubnub.config.subscribe_key) == 0: raise PubNubException(pn_error=PNERR_SUBSCRIBE_KEY_MISSING) + def validate_channels_and_groups(self): + if len(self._channels) == 0 and len(self._groups) == 0: + raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) + def validate_publish_key(self): if self.pubnub.config.publish_key is None or len(self.pubnub.config.publish_key) == 0: raise PubNubException(pn_error=PNERR_PUBLISH_KEY_MISSING) diff --git a/pubnub/endpoints/pubsub/get_state.py b/pubnub/endpoints/pubsub/get_state.py new file mode 100644 index 00000000..92d01b47 --- /dev/null +++ b/pubnub/endpoints/pubsub/get_state.py @@ -0,0 +1,65 @@ +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.presence import PNGetStateResult + + +class GetState(Endpoint): + # /v2/presence/sub-key//channel//uuid//data?state= + GET_STATE_PATH = "/v2/presence/sub-key/%s/channel/%s/uuid/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = [] + self._groups = [] + + def channels(self, channels): + utils.extend_list(self._channels, channels) + return self + + def channel_groups(self, channel_groups): + utils.extend_list(self._groups, channel_groups) + return self + + def build_params(self): + params = self.default_params() + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items(self._groups) + + return params + + def build_path(self): + return GetState.GET_STATE_PATH % ( + self.pubnub.config.subscribe_key, + utils.join_channels(self._channels), + self.pubnub.uuid + ) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + self.validate_channels_and_groups() + + def create_response(self, envelope): + if len(self._channels) == 1 and len(self._groups) == 0: + channels = {self._channels[0]: envelope['payload']} + else: + channels = envelope['payload']['channels'] + + return PNGetStateResult(channels) + + def affected_channels(self): + return self._channels + + def affected_channels_groups(self): + return self._groups + + def operation_type(self): + return PNOperationType.PNGetState + + def name(self): + return "GetState" diff --git a/pubnub/endpoints/pubsub/set_state.py b/pubnub/endpoints/pubsub/set_state.py new file mode 100644 index 00000000..afaa7d45 --- /dev/null +++ b/pubnub/endpoints/pubsub/set_state.py @@ -0,0 +1,72 @@ +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING, PNERR_STATE_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.presence import PNSetStateResult + + +class SetState(Endpoint): + # /v2/presence/sub-key//channel//uuid//data?state= + SET_STATE_PATH = "/v2/presence/sub-key/%s/channel/%s/uuid/%s/data" + + def __init__(self, pubnub, subscription_manager=None): + Endpoint.__init__(self, pubnub) + self._subscription_manager = subscription_manager + self._channels = [] + self._groups = [] + self._state = None + + def channels(self, channels): + utils.extend_list(self._channels, channels) + return self + + def channel_groups(self, channel_groups): + utils.extend_list(self._groups, channel_groups) + return self + + def state(self, state): + self._state = state + return self + + def build_params(self): + params = self.default_params() + + params['state'] = utils.write_value_as_string(self._state) + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items(self._groups) + + return params + + def build_path(self): + return SetState.SET_STATE_PATH % ( + self.pubnub.config.subscribe_key, + utils.join_channels(self._channels), + self.pubnub.uuid + ) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + self.validate_channels_and_groups() + + if self._state is None or not isinstance(self._state, dict): + raise PubNubException(pn_error=PNERR_STATE_MISSING) + + def create_response(self, envelope): + return PNSetStateResult(envelope['payload']) + + def affected_channels(self): + return self._channels + + def affected_channels_groups(self): + return self._groups + + def operation_type(self): + return PNOperationType.PNSetStateOperation + + def name(self): + return "SetState" diff --git a/pubnub/errors.py b/pubnub/errors.py index e40b18ad..b477d957 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -18,3 +18,4 @@ PNERR_JSON_DECODING_FAILED = "JSON decoding failed" PNERR_JSON_NOT_SERIALIZABLE = "Trying to publish not JSON serializable object" PNERR_CHANNEL_OR_GROUP_MISSING = "Channel or group missing" +PNERR_STATE_MISSING = "State missing or not a dict" diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index dce9617a..b2762d51 100755 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -65,3 +65,15 @@ class PNHereNowOccupantsData(object): def __init__(self, uuid, state): self.uuid = uuid self.state = state + + +class PNSetStateResult(object): + def __init__(self, state): + assert isinstance(state, dict) + self.state = state + + +class PNGetStateResult(object): + def __init__(self, channels): + assert isinstance(channels, dict) + self.channels = channels diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index aceef3cb..b273a761 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -6,6 +6,8 @@ from tornado.log import gen_log from tornado.simple_httpclient import SimpleAsyncHTTPClient +from pubnub.endpoints.pubsub.get_state import GetState +from pubnub.endpoints.pubsub.set_state import SetState from . import utils from .endpoints.pubsub.leave import Leave from .workers import SubscribeMessageWorker @@ -122,6 +124,12 @@ def subscribe(self): def unsubscribe(self): return UnsubscribeBuilder(self._subscription_manager) + def set_state(self): + return SetState(self, self._subscription_manager) + + def get_state(self): + return GetState(self) + # TODO: extract this into a separate class def request_sync(self, *args): raise NotImplementedError diff --git a/tests/functional/test_get_state.py b/tests/functional/test_get_state.py new file mode 100644 index 00000000..fb565bab --- /dev/null +++ b/tests/functional/test_get_state.py @@ -0,0 +1,53 @@ +import unittest + +from pubnub.endpoints.pubsub.get_state import GetState + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestGetState(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_GetStateTest" + self.get_state = GetState(self.pubnub) + + def test_get_state_single_channel(self): + self.get_state.channels('ch') + + self.assertEquals(self.get_state.build_path(), GetState.GET_STATE_PATH % (pnconf.subscribe_key, + "ch", + self.pubnub.uuid)) + + self.assertEqual(self.get_state.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + }) + + self.assertEqual(self.get_state._channels, ['ch']) + + def test_get_state_single_group(self): + self.get_state.channel_groups('gr') + + self.assertEquals(self.get_state.build_path(), GetState.GET_STATE_PATH % (pnconf.subscribe_key, + ",", + self.pubnub.uuid)) + + self.assertEqual(self.get_state.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'channel-group': 'gr' + }) + + assert len(self.get_state._channels) == 0 + self.assertEqual(self.get_state._groups, ['gr']) diff --git a/tests/functional/test_set_state.py b/tests/functional/test_set_state.py new file mode 100644 index 00000000..c29db19d --- /dev/null +++ b/tests/functional/test_set_state.py @@ -0,0 +1,57 @@ +import json +import unittest + +from pubnub.endpoints.pubsub.set_state import SetState + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestSetState(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_SetStateTest" + self.set_state = SetState(self.pubnub) + self.state = {'name': 'Alex', "count": 5} + + def test_set_state_single_channel(self): + self.set_state.channels('ch').state(self.state) + + self.assertEquals(self.set_state.build_path(), SetState.SET_STATE_PATH % (pnconf.subscribe_key, + "ch", + self.pubnub.uuid)) + + self.assertEqual(self.set_state.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'state': json.dumps(self.state) + }) + + self.assertEqual(self.set_state._channels, ['ch']) + + def test_set_state_single_group(self): + self.set_state.channel_groups('gr').state(self.state) + + self.assertEquals(self.set_state.build_path(), SetState.SET_STATE_PATH % (pnconf.subscribe_key, + ",", + self.pubnub.uuid)) + + self.assertEqual(self.set_state.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'state': json.dumps(self.state), + 'channel-group': 'gr' + }) + + assert len(self.set_state._channels) == 0 + self.assertEqual(self.set_state._groups, ['gr']) diff --git a/tests/integrational/tornado/test_set_state.py b/tests/integrational/tornado/test_set_state.py new file mode 100644 index 00000000..50ec8f32 --- /dev/null +++ b/tests/integrational/tornado/test_set_state.py @@ -0,0 +1,80 @@ +import tornado +from tornado import gen +from tornado.locks import Event +from tornado.testing import AsyncHTTPTestCase, AsyncTestCase + +from pubnub.callbacks import SubscribeCallback +from pubnub.pubnub_tornado import PubNubTornado +from tests import helper +from tests.helper import pnconf + + +class ConnectionEvent(SubscribeCallback): + def __init__(self, event, expected_status_checker): + self.event = event + self.expected_status_checker = expected_status_checker + + def status(self, pubnub, status): + if self.expected_status_checker(status): + self.event.set() + + def presence(self, pubnub, presence): + pass + + def message(self, pubnub, message): + pass + + +class TestPubNubState(AsyncTestCase): + def setUp(self): + super(TestPubNubState, self).setUp() + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + + @tornado.testing.gen_test + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + state = {"name": "Alex", "count": 5} + + env = yield self.pubnub.set_state() \ + .channels(ch) \ + .state(state) \ + .future() + + assert env.result.state['name'] == "Alex" + assert env.result.state['count'] == 5 + + env = yield self.pubnub.get_state() \ + .channels(ch) \ + .future() + + assert env.result.channels[ch]['name'] == "Alex" + assert env.result.channels[ch]['count'] == 5 + + self.pubnub.stop() + self.stop() + + @tornado.testing.gen_test + def test_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + state = {"name": "Alex", "count": 5} + + env = yield self.pubnub.set_state() \ + .channels([ch1, ch2]) \ + .state(state) \ + .future() + + assert env.result.state['name'] == "Alex" + assert env.result.state['count'] == 5 + + env = yield self.pubnub.get_state() \ + .channels([ch1, ch2]) \ + .future() + + assert env.result.channels[ch1]['name'] == "Alex" + assert env.result.channels[ch2]['name'] == "Alex" + assert env.result.channels[ch1]['count'] == 5 + assert env.result.channels[ch2]['count'] == 5 + + self.pubnub.stop() + self.stop() From 957dbab691fabc304d77ba0ed4af81c587aeccab Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 21 Jun 2016 10:09:18 -0700 Subject: [PATCH 119/468] Add exception for CG state setter --- pubnub/endpoints/pubsub/set_state.py | 11 +++++++++-- pubnub/errors.py | 1 + tests/integrational/tornado/test_set_state.py | 17 ++--------------- 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/pubnub/endpoints/pubsub/set_state.py b/pubnub/endpoints/pubsub/set_state.py index afaa7d45..01e2fa44 100644 --- a/pubnub/endpoints/pubsub/set_state.py +++ b/pubnub/endpoints/pubsub/set_state.py @@ -1,6 +1,7 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING, PNERR_STATE_MISSING +from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING, PNERR_STATE_MISSING, \ + PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType from pubnub.models.consumer.presence import PNSetStateResult @@ -53,11 +54,17 @@ def validate_params(self): self.validate_subscribe_key() self.validate_channels_and_groups() + if len(self._channels) == 0 and len(self._groups) > 0: + raise PubNubException(pn_error=PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET) + if self._state is None or not isinstance(self._state, dict): raise PubNubException(pn_error=PNERR_STATE_MISSING) def create_response(self, envelope): - return PNSetStateResult(envelope['payload']) + if 'status' in envelope and envelope['status'] is 200: + return PNSetStateResult(envelope['payload']) + else: + return envelope def affected_channels(self): return self._channels diff --git a/pubnub/errors.py b/pubnub/errors.py index b477d957..ecc7590b 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -19,3 +19,4 @@ PNERR_JSON_NOT_SERIALIZABLE = "Trying to publish not JSON serializable object" PNERR_CHANNEL_OR_GROUP_MISSING = "Channel or group missing" PNERR_STATE_MISSING = "State missing or not a dict" +PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET = "State setter for channel groups is not supported yet" diff --git a/tests/integrational/tornado/test_set_state.py b/tests/integrational/tornado/test_set_state.py index 50ec8f32..892b469f 100644 --- a/tests/integrational/tornado/test_set_state.py +++ b/tests/integrational/tornado/test_set_state.py @@ -8,21 +8,8 @@ from tests import helper from tests.helper import pnconf - -class ConnectionEvent(SubscribeCallback): - def __init__(self, event, expected_status_checker): - self.event = event - self.expected_status_checker = expected_status_checker - - def status(self, pubnub, status): - if self.expected_status_checker(status): - self.event.set() - - def presence(self, pubnub, presence): - pass - - def message(self, pubnub, message): - pass +# TODO: test for 'No valid channels specified' +# TODO: test for CG state getter (after implementation of CG methods) class TestPubNubState(AsyncTestCase): From ff533f403ef2bbbdae603febabd5e361666eb559 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 06:43:05 -0700 Subject: [PATCH 120/468] Fix here_now response handling; Add tests --- pubnub/endpoints/presence/herenow.py | 18 +- pubnub/models/consumer/presence.py | 84 ++++++--- tests/integrational/tornado/test_here_now.py | 9 +- tests/unit/test_herenow.py | 177 +++++++++++++++++-- 4 files changed, 228 insertions(+), 60 deletions(-) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 784ded64..e94963f5 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -56,23 +56,7 @@ def validate_params(self): self.validate_subscribe_key() def create_response(self, envelope): - if len(self._channels) > 1 or len(self._channel_groups) > 0: - return self.parse_multiple_channel_response(envelope) - else: - return self.parse_single_channel_response(envelope) - - def parse_single_channel_response(self, envelope): - channels = None - occupants = None - if self._include_uuids: - channels = [PNHereNowChannelData(self._channels[0], - envelope['occupancy'], - occupants)] - - return PNHereNowChannelData(1, int(envelope['total_occupancy']), channels) - - def parse_multiple_channel_response(self, envelope): - return PNHereNowResult.from_json(envelope) + return PNHereNowResult.from_json(envelope, self._channels) def operation_type(self): return PNOperationType.PNPublishOperation diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index b2762d51..8663d647 100755 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -11,30 +11,62 @@ def __init__(self, total_channels, total_occupancy, channels): self.channels = channels @classmethod - def from_json(cls, envelope, channels): + def from_json(cls, envelope, channel_names): # multiple - if 'channels' in envelope and isinstance(envelope['channels'], dict): + if 'payload' in envelope and isinstance(envelope['payload'], dict): json_input = envelope['payload'] - channels = [] - for channel_name, raw_data in json_input['channels'].items(): - channels.append(PNHereNowChannelData.from_json(channel_name, raw_data)) - return PNHereNowResult(int(json_input['total_channels']), int(json_input['total_occupancy']), channels) + channels = [] + if len(json_input['channels']) > 0: + for channel_name, raw_data in json_input['channels'].items(): + channels.append(PNHereNowChannelData.from_json(channel_name, raw_data)) + return PNHereNowResult( + total_channels=int(json_input['total_channels']), + total_occupancy=int(json_input['total_occupancy']), + channels=channels) + else: + return PNHereNowResult( + total_channels=int(1), + total_occupancy=int(json_input['total_occupancy']), + channels=[PNHereNowChannelData(channel_names[0], 0, [])] + ) # empty elif 'occupancy' in envelope and int(envelope['occupancy']) == 0: - return PNHereNowResult(int(1), int(envelope['occupancy']), []) + return PNHereNowResult( + total_channels=int(1), + total_occupancy=int(envelope['occupancy']), + channels=[PNHereNowChannelData(channel_names[0], 0, [])] + ) # single elif 'uuids' in envelope and isinstance(envelope['uuids'], list): occupants = [] - for uuid in envelope['uuids']: - occupants.append( - PNHereNowOccupantsData(channels[0], uuid)) - - channels = [PNHereNowChannelData(channels[0], - envelope['occupancy'], - occupants)] - - return PNHereNowResult(1, int(envelope['occupancy']), channels) + for user in envelope['uuids']: + if isinstance(user, six.string_types): + occupants.append(PNHereNowOccupantsData(user, None)) + else: + occupants.append(PNHereNowOccupantsData(user['uuid'], user['state'])) + + return PNHereNowResult( + total_channels=1, + total_occupancy=int(envelope['occupancy']), + channels=[ + PNHereNowChannelData( + channel_name=channel_names[0], + occupancy=envelope['occupancy'], + occupants=occupants + ) + ]) + else: + return PNHereNowResult( + total_channels=1, + total_occupancy=int(envelope['occupancy']), + channels=[ + PNHereNowChannelData( + channel_name=channel_names[0], + occupancy=envelope['occupancy'], + occupants=[] + ) + ]) class PNHereNowChannelData(object): @@ -45,14 +77,18 @@ def __init__(self, channel_name, occupancy, occupants): @classmethod def from_json(cls, name, json_input): - occupants = [] - - if isinstance(json_input['uuids'], list): - for uuid in json_input['uuids']: - occupants.append(PNHereNowOccupantsData(uuid, None)) - elif isinstance(json_input['uuids'], dict): - for uuid, state in json_input['uuids'].items(): - occupants.append(PNHereNowOccupantsData(uuid, state)) + if 'uuids' in json_input: + occupants = [] + for user in json_input['uuids']: + if isinstance(user, dict) and len(user) > 0: + if 'state' in user: + occupants.append(PNHereNowOccupantsData(user['uuid'], user['state'])) + else: + occupants.append(PNHereNowOccupantsData(user['uuid'], None)) + else: + occupants.append(PNHereNowOccupantsData(user, None)) + else: + occupants = None return PNHereNowChannelData( channel_name=name, diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 449e5d1e..4e49e5d3 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -58,17 +58,14 @@ def test_single_channel(self): .include_uuids(True) \ .future() - print(env.result) - assert env.result.total_channels == 2 + assert env.result.total_channels == 1 assert env.result.total_occupancy >= 1 channels = env.result.channels - assert len(channels) == 2 + assert len(channels) == 1 assert channels[0].occupancy == 1 assert channels[0].occupants[0].uuid == self.pubnub.uuid - assert channels[1].occupancy == 1 - assert channels[1].occupants[0].uuid == self.pubnub.uuid yield disconnect_from_channel(self.pubnub, ch) self.pubnub.stop() @@ -82,10 +79,8 @@ def test_multiple_channels(self): yield gen.sleep(2) env = yield self.pubnub.here_now() \ .channels([ch1, ch2]) \ - .include_uuids(False) \ .future() - print(env.result) assert env.result.total_channels == 2 assert env.result.total_occupancy >= 1 diff --git a/tests/unit/test_herenow.py b/tests/unit/test_herenow.py index 72c9296a..2e0aa7c7 100644 --- a/tests/unit/test_herenow.py +++ b/tests/unit/test_herenow.py @@ -4,28 +4,33 @@ empty = {'service': 'Presence', 'status': 200, 'message': 'OK', 'occupancy': 0, 'uuids': []} empty_disable_uuids = {'message': 'OK', 'occupancy': 0, 'status': 200, 'service': 'Presence'} +empty_multiple = {'service': 'Presence', 'status': 200, 'payload': { + 'total_channels': 0, 'total_occupancy': 0, 'channels': {}}, 'message': 'OK'} single = {'status': 200, 'message': 'OK', 'service': 'Presence', 'occupancy': 1, 'uuids': ['08c36f36-7b00-41c9-b101-d07b19bc30cb']} single_disable_uuids = {'service': 'Presence', 'occupancy': 1, 'message': 'OK', 'status': 200} -single_with_state = {'uuids': [{'uuid': 'c190fbdc-dcde-4553-9085-85f8dedf76e4'}], 'status': 200, 'occupancy': 1, - 'service': 'Presence', 'message': 'OK'} +single_with_state = {'status': 200, 'message': 'OK', 'occupancy': 1, 'service': 'Presence', + 'uuids': [{'state': {'count': 5, 'name': 'Alex'}, 'uuid': '6cbb18b9-3f58-4bd3-91c0-5dbf18a4af13'}]} multiple = {'status': 200, 'message': 'OK', 'payload': {'total_channels': 2, 'channels': { 'here-now-GIY92DGX': {'occupancy': 1, 'uuids': ['c71b2961-9624-4801-90bc-6c89a725a422']}, 'here-now-B1WZA4LO': {'occupancy': 1, 'uuids': ['c71b2961-9624-4801-90bc-6c89a725a422']}}, 'total_occupancy': 2}, 'service': 'Presence'} -multiple_with_state_disable_uuids = { +multiple_disable_uuids = { 'payload': {'channels': {'here-now-IUX5HV7O': {'occupancy': 1}, 'here-now-FGE5Q9UY': {'occupancy': 1}}, 'total_occupancy': 2, 'total_channels': 2}, 'message': 'OK', 'service': 'Presence', 'status': 200} -multiple_with_state = {'payload': {'total_occupancy': 2, 'channels': { - 'here-now-16IAN0F9': {'occupancy': 1, 'uuids': [{'uuid': 'd66b4e96-8972-4f1d-9942-46dd60947d85'}]}, - 'here-now-249XRUPW': {'occupancy': 1, 'uuids': [{'uuid': 'd66b4e96-8972-4f1d-9942-46dd60947d85'}]}}, - 'total_channels': 2}, 'service': 'Presence', 'status': 200, 'message': 'OK'} +multiple_with_state = {'payload': {'total_channels': 2, 'channels': { + 'here-now-UBJJ5P3W': { + 'uuids': [{'state': {'count': 5, 'name': 'Alex'}, 'uuid': 'abf41ee8-0853-4e1c-8450-906933695b09'}], + 'occupancy': 1 + }, + 'here-now-EZTFTHZY': {'uuids': [{'uuid': 'abf41ee8-0853-4e1c-8450-906933695b09'}], 'occupancy': 1}}, + 'total_occupancy': 2}, 'status': 200, 'message': 'OK', 'service': 'Presence'} class TestHereNowResultGenerator(unittest.TestCase): - def test_empty(self): + def test_empty_occupancy(self): channel_names = ['blah'] response = PNHereNowResult.from_json(empty, channel_names) channels = response.channels @@ -33,7 +38,7 @@ def test_empty(self): assert response.total_channels == 1 assert response.total_occupancy == 0 assert isinstance(channels, list) - assert len(channels) == 0 + assert len(channels) == 1 def test_empty_disable_uuids(self): channel_names = ['blah'] @@ -43,7 +48,17 @@ def test_empty_disable_uuids(self): assert response.total_channels == 1 assert response.total_occupancy == 0 assert isinstance(channels, list) - assert len(channels) == 0 + assert len(channels) == 1 + + def test_empty_multiple(self): + channel_names = ['blah'] + response = PNHereNowResult.from_json(empty_multiple, channel_names) + channels = response.channels + + assert response.total_channels == 1 + assert response.total_occupancy == 0 + assert isinstance(channels, list) + assert len(channels) == 1 def test_single(self): channel_names = ['blah'] @@ -51,6 +66,144 @@ def test_single(self): channels = response.channels assert response.total_channels == 1 - assert response.total_occupancy == 0 + assert response.total_occupancy == 1 assert isinstance(channels, list) - assert len(channels) == 0 \ No newline at end of file + assert len(channels) == 1 + + channel = channels[0] + + assert channel.channel_name == 'blah' + assert channel.occupancy == 1 + assert len(channel.occupants) == 1 + + occupants = channel.occupants[0] + + assert occupants.state is None + assert occupants.uuid == single['uuids'][0] + + def test_single_disable_uuids(self): + channel_names = ['blah'] + response = PNHereNowResult.from_json(single_disable_uuids, channel_names) + channels = response.channels + + assert response.total_channels == 1 + assert response.total_occupancy == 1 + assert isinstance(channels, list) + assert len(channels) == 1 + + channel = channels[0] + + assert channel.channel_name == 'blah' + assert channel.occupancy == 1 + assert len(channel.occupants) == 0 + + def test_single_with_state(self): + channel_names = ['blah'] + response = PNHereNowResult.from_json(single_with_state, channel_names) + channels = response.channels + + assert response.total_channels == 1 + assert response.total_occupancy == 1 + assert isinstance(channels, list) + assert len(channels) == 1 + + channel = channels[0] + + assert channel.channel_name == 'blah' + assert channel.occupancy == 1 + assert len(channel.occupants) == 1 + + occupants = channel.occupants[0] + + assert occupants.uuid == single_with_state['uuids'][0]['uuid'] + assert occupants.state == single_with_state['uuids'][0]['state'] + + def test_multiple(self): + channel_names = list(multiple['payload']['channels']) + response = PNHereNowResult.from_json(multiple, channel_names) + channels = response.channels + + assert response.total_channels == 2 + assert response.total_occupancy == 2 + assert isinstance(channels, list) + assert len(channels) == 2 + + channel1 = channels[0] + + assert channel1.channel_name == channel_names[0] + assert channel1.occupancy == multiple['payload']['channels'][channel_names[0]]['occupancy'] + assert len(channel1.occupants) == 1 + + occupants = channel1.occupants[0] + + assert occupants.state is None + assert occupants.uuid == multiple['payload']['channels'][channel_names[0]]['uuids'][0] + + channel2 = channels[1] + + assert channel2.channel_name == channel_names[1] + assert channel2.occupancy == multiple['payload']['channels'][channel_names[1]]['occupancy'] + assert len(channel2.occupants) == 1 + + occupants = channel2.occupants[0] + + assert occupants.state is None + assert occupants.uuid == multiple['payload']['channels'][channel_names[1]]['uuids'][0] + + def test_multiple_disable_uuids(self): + channel_names = list(multiple_disable_uuids['payload']['channels']) + response = PNHereNowResult.from_json(multiple_disable_uuids, channel_names) + channels = response.channels + + assert response.total_channels == 2 + assert response.total_occupancy == 2 + assert isinstance(channels, list) + assert len(channels) == 2 + + channel1 = channels[0] + + assert channel1.channel_name == channel_names[0] + assert channel1.occupancy == multiple_disable_uuids['payload']['channels'][channel_names[0]]['occupancy'] + assert channel1.occupants is None + + channel2 = channels[1] + + assert channel2.channel_name == channel_names[1] + assert channel2.occupancy == multiple_disable_uuids['payload']['channels'][channel_names[1]]['occupancy'] + assert channel2.occupants is None + + def test_multiple_with_state(self): + channel_names = list(reversed(sorted(list(multiple_with_state['payload']['channels'])))) + response = PNHereNowResult.from_json(multiple_with_state, channel_names) + channels = response.channels + + assert response.total_channels == 2 + assert response.total_occupancy == 2 + assert isinstance(channels, list) + assert len(channels) == 2 + + if channels[0].channel_name == channel_names[0]: + channel1 = channels[0] + channel2 = channels[1] + else: + channel1 = channels[1] + channel2 = channels[0] + + assert channel1.channel_name == channel_names[0] + assert channel1.occupancy == multiple_with_state['payload']['channels'][channel1.channel_name]['occupancy'] + assert len(channel1.occupants) == 1 + + occupants = channel1.occupants[0] + + assert occupants.state['name'] == "Alex" + assert occupants.state['count'] == 5 + assert occupants.uuid == multiple_with_state['payload']['channels'][channel1.channel_name]['uuids'][0]['uuid'] + + assert channel2.channel_name == channel_names[1] + assert channel2.occupancy == multiple_with_state['payload']['channels'][channel2.channel_name]['occupancy'] + assert len(channel2.occupants) == 1 + + occupants = channel2.occupants[0] + + assert occupants.state is None + assert occupants.uuid == multiple_with_state['payload']['channels'][channel2.channel_name]['uuids'][0]['uuid'] From 30d905ed8e78cafa75708c32b10d300af4d43d7d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 06:48:48 -0700 Subject: [PATCH 121/468] Add Global HereNew --- pubnub/endpoints/presence/herenow.py | 7 +++++-- tests/integrational/tornado/test_here_now.py | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index e94963f5..310b11e6 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -46,8 +46,11 @@ def build_params(self): return params def build_path(self): - return HereNow.HERE_NOW_PATH % (self.pubnub.config.subscribe_key, - utils.join_channels(self._channels)) + if len(self._channels) == 0 and len(self._channel_groups) == 0: + return HereNow.HERE_NOW_GLOBAL_PATH % self.pubnub.config.subscribe_key + else: + return HereNow.HERE_NOW_PATH % (self.pubnub.config.subscribe_key, + utils.join_channels(self._channels)) def http_method(self): return HttpMethod.GET diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 4e49e5d3..31a8ee1a 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -96,3 +96,20 @@ def test_multiple_channels(self): self.pubnub.stop() self.stop() + @tornado.testing.gen_test + def test_global(self): + ch1 = helper.gen_channel("here-now") + ch2 = helper.gen_channel("here-now") + + yield connect_to_channel(self.pubnub, [ch1, ch2]) + yield gen.sleep(2) + + env = yield self.pubnub.here_now().future() + + assert env.result.total_channels > 2 + assert env.result.total_occupancy >= 1 + + yield disconnect_from_channel(self.pubnub, [ch1, ch2]) + + self.pubnub.stop() + self.stop() From a48f51bac86ae131476bdccad1fdb816a94e6daa Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 06:50:54 -0700 Subject: [PATCH 122/468] Fix python 2.7.11 imports compatibility --- pubnub/pubnub_tornado.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index b273a761..f1515e40 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -6,12 +6,12 @@ from tornado.log import gen_log from tornado.simple_httpclient import SimpleAsyncHTTPClient -from pubnub.endpoints.pubsub.get_state import GetState -from pubnub.endpoints.pubsub.set_state import SetState from . import utils from .endpoints.pubsub.leave import Leave from .workers import SubscribeMessageWorker from .endpoints.pubsub.subscribe import Subscribe +from .endpoints.pubsub.set_state import SetState +from .endpoints.pubsub.get_state import GetState from .managers import SubscriptionManager from .builders import SubscribeBuilder, UnsubscribeBuilder from .enums import PNStatusCategory From af733ad245d7acdf79b665434e1ffb8d263f3dcc Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 07:39:26 -0700 Subject: [PATCH 123/468] Add AddChannelToChannelGroup method implementation with Tornado tests --- pubnub/endpoints/channel_groups/__init__.py | 0 .../add_channel_to_channel_group.py | 63 +++++++++++++++++++ pubnub/errors.py | 2 + tests/functional/test_add_channel_to_cg.py | 53 ++++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 pubnub/endpoints/channel_groups/__init__.py create mode 100644 pubnub/endpoints/channel_groups/add_channel_to_channel_group.py create mode 100644 tests/functional/test_add_channel_to_cg.py diff --git a/pubnub/endpoints/channel_groups/__init__.py b/pubnub/endpoints/channel_groups/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py new file mode 100644 index 00000000..a34dd210 --- /dev/null +++ b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py @@ -0,0 +1,63 @@ +import six + +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_CHANNELS_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType + + +class AddChannelToChannelGroup(Endpoint): + # /v1/channel-registration/sub-key//channel-group/?add=ch1,ch2 + ADD_PATH = "/v1/channel-registration/sub-key/%s/channel-group/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = [] + self._channel_group = None + + def channels(self, channels): + if isinstance(channels, (list, tuple)): + self._channels.extend(channels) + else: + self._channels.extend(utils.split_items(channels)) + + return self + + def channel_group(self, channel_group): + self._channel_group = channel_group + + return self + + def build_params(self): + params = self.default_params() + + params['add'] = utils.join_items(self._channels) + + return params + + def build_path(self): + return AddChannelToChannelGroup.ADD_PATH % ( + self.pubnub.config.subscribe_key, self._channel_group) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if len(self._channels) == 0: + raise PubNubException(pn_error=PNERR_CHANNELS_MISSING) + + if not isinstance(self._channel_group, six.string_types)\ + or len(self._channel_group) == 0: + raise PubNubException(pn_error=PNERR_CHANNELS_MISSING) + + def create_response(self, envelope): + return envelope + + def operation_type(self): + return PNOperationType.PNAddChannelsToGroupOperation + + def name(self): + return "AddChannelToChannelGroup" diff --git a/pubnub/errors.py b/pubnub/errors.py index ecc7590b..78eb40e9 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -10,6 +10,8 @@ PNERR_CLIENT_ERROR = "HTTP Client Error" PNERR_UNKNOWN_ERROR = "Unknown Error" PNERR_CHANNEL_MISSING = "Channel missing" +PNERR_CHANNELS_MISSING = "Channels missing" +PNERR_GROUP_MISSING = "Channel group missing" PNERR_MESSAGE_MISSING = "Message missing" PNERR_SUBSCRIBE_KEY_MISSING = "Subscribe key not configured" PNERR_PUBLISH_KEY_MISSING = "Publish key not configured" diff --git a/tests/functional/test_add_channel_to_cg.py b/tests/functional/test_add_channel_to_cg.py new file mode 100644 index 00000000..27db54bc --- /dev/null +++ b/tests/functional/test_add_channel_to_cg.py @@ -0,0 +1,53 @@ +import unittest + +from pubnub.endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestAddChannelToChannelGroup(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_AddChannelToCGTest" + self.add = AddChannelToChannelGroup(self.pubnub) + + def test_add_single_channel(self): + self.add.channels('ch').channel_group('gr') + + self.assertEquals(self.add.build_path(), + AddChannelToChannelGroup.ADD_PATH % ( + pnconf.subscribe_key, "gr")) + + self.assertEqual(self.add.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'add': "ch" + }) + + self.assertEqual(self.add._channels, ['ch']) + + def test_add_multiple_channels(self): + self.add.channels(['ch1', 'ch2']).channel_group('gr') + + self.assertEquals(self.add.build_path(), + AddChannelToChannelGroup.ADD_PATH % ( + pnconf.subscribe_key, "gr")) + + self.assertEqual(self.add.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'add': "ch1,ch2" + }) + + self.assertEqual(self.add._channels, ['ch1', 'ch2']) From 7e05ed5a5307c1f78edf939ca5be1b503d661a44 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 07:45:59 -0700 Subject: [PATCH 124/468] Add RemoveChannelFromChannelGroup method implementation with Tornado tests --- .../remove_channel_from_channel_group.py | 63 +++++++++++++++++++ .../functional/test_remove_channel_from_cg.py | 53 ++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py create mode 100644 tests/functional/test_remove_channel_from_cg.py diff --git a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py new file mode 100644 index 00000000..1505a9cf --- /dev/null +++ b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py @@ -0,0 +1,63 @@ +import six + +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_CHANNELS_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType + + +class RemoveChannelFromChannelGroup(Endpoint): + # /v1/channel-registration/sub-key//channel-group/?remove=ch1,ch2 + REMOVE_PATH = "/v1/channel-registration/sub-key/%s/channel-group/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = [] + self._channel_group = None + + def channels(self, channels): + if isinstance(channels, (list, tuple)): + self._channels.extend(channels) + else: + self._channels.extend(utils.split_items(channels)) + + return self + + def channel_group(self, channel_group): + self._channel_group = channel_group + + return self + + def build_params(self): + params = self.default_params() + + params['remove'] = utils.join_items(self._channels) + + return params + + def build_path(self): + return RemoveChannelFromChannelGroup.REMOVE_PATH % ( + self.pubnub.config.subscribe_key, self._channel_group) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if len(self._channels) == 0: + raise PubNubException(pn_error=PNERR_CHANNELS_MISSING) + + if not isinstance(self._channel_group, six.string_types)\ + or len(self._channel_group) == 0: + raise PubNubException(pn_error=PNERR_CHANNELS_MISSING) + + def create_response(self, envelope): + return envelope + + def operation_type(self): + return PNOperationType.PNRemoveChannelsFromGroupOperation + + def name(self): + return "RemoveChannelToChannelGroup" diff --git a/tests/functional/test_remove_channel_from_cg.py b/tests/functional/test_remove_channel_from_cg.py new file mode 100644 index 00000000..574e53ef --- /dev/null +++ b/tests/functional/test_remove_channel_from_cg.py @@ -0,0 +1,53 @@ +import unittest + +from pubnub.endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestRemoveChannelToChannelGroup(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_RemoveChannelToCGTest" + self.remove = RemoveChannelFromChannelGroup(self.pubnub) + + def test_remove_single_channel(self): + self.remove.channels('ch').channel_group('gr') + + self.assertEquals(self.remove.build_path(), + RemoveChannelFromChannelGroup.REMOVE_PATH % ( + pnconf.subscribe_key, "gr")) + + self.assertEqual(self.remove.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'remove': "ch" + }) + + self.assertEqual(self.remove._channels, ['ch']) + + def test_remove_multiple_channels(self): + self.remove.channels(['ch1', 'ch2']).channel_group('gr') + + self.assertEquals(self.remove.build_path(), + RemoveChannelFromChannelGroup.REMOVE_PATH % ( + pnconf.subscribe_key, "gr")) + + self.assertEqual(self.remove.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'remove': "ch1,ch2" + }) + + self.assertEqual(self.remove._channels, ['ch1', 'ch2']) From 61102615ae83a9099a3737aae9eb56705d8457dc Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 07:59:25 -0700 Subject: [PATCH 125/468] Add ListChannelsInChannelGroup method implementation with Tornado tests --- .../list_channels_in_channel_group.py | 46 +++++++++++++++++++ tests/functional/test_list_channels_in_cg.py | 35 ++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 pubnub/endpoints/channel_groups/list_channels_in_channel_group.py create mode 100644 tests/functional/test_list_channels_in_cg.py diff --git a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py new file mode 100644 index 00000000..2c1ae512 --- /dev/null +++ b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py @@ -0,0 +1,46 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_GROUP_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType + + +class ListChannelsInChannelGroup(Endpoint): + # /v1/channel-registration/sub-key//channel-group/ + LIST_PATH = "/v1/channel-registration/sub-key/%s/channel-group/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channel_group = None + + def channel_group(self, channel_group): + self._channel_group = channel_group + + return self + + def build_params(self): + return self.default_params() + + def build_path(self): + return ListChannelsInChannelGroup.LIST_PATH % ( + self.pubnub.config.subscribe_key, self._channel_group) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if not isinstance(self._channel_group, six.string_types)\ + or len(self._channel_group) == 0: + raise PubNubException(pn_error=PNERR_GROUP_MISSING) + + def create_response(self, envelope): + return envelope + + def operation_type(self): + return PNOperationType.PNChannelsForGroupOperation + + def name(self): + return "ListChannelsInChannelGroup" diff --git a/tests/functional/test_list_channels_in_cg.py b/tests/functional/test_list_channels_in_cg.py new file mode 100644 index 00000000..09c6eea3 --- /dev/null +++ b/tests/functional/test_list_channels_in_cg.py @@ -0,0 +1,35 @@ +import unittest + +from pubnub.endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestListChannelsInChannelGroup(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_ListChannelsInCGTest" + self.list = ListChannelsInChannelGroup(self.pubnub) + + def test_list_channel_group(self): + self.list.channel_group('gr') + + self.assertEquals(self.list.build_path(), + ListChannelsInChannelGroup.LIST_PATH % ( + pnconf.subscribe_key, "gr")) + + self.assertEqual(self.list.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + }) From 985825a99fbbd5082c9c4936a8d9981dce323833 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 08:19:11 -0700 Subject: [PATCH 126/468] Add RemoveChannelGroup method implementation with Tornado tests --- .../channel_groups/remove_channel_group.py | 46 +++++++++++++++++++ tests/functional/test_remove_cg.py | 35 ++++++++++++++ 2 files changed, 81 insertions(+) create mode 100644 pubnub/endpoints/channel_groups/remove_channel_group.py create mode 100644 tests/functional/test_remove_cg.py diff --git a/pubnub/endpoints/channel_groups/remove_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_group.py new file mode 100644 index 00000000..19da5730 --- /dev/null +++ b/pubnub/endpoints/channel_groups/remove_channel_group.py @@ -0,0 +1,46 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_GROUP_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType + + +class RemoveChannelGroup(Endpoint): + # /v1/channel-registration/sub-key//channel-group//remove + REMOVE_PATH = "/v1/channel-registration/sub-key/%s/channel-group/%s/remove" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channel_group = None + + def channel_group(self, channel_group): + self._channel_group = channel_group + + return self + + def build_params(self): + return self.default_params() + + def build_path(self): + return RemoveChannelGroup.REMOVE_PATH % ( + self.pubnub.config.subscribe_key, self._channel_group) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if not isinstance(self._channel_group, six.string_types)\ + or len(self._channel_group) == 0: + raise PubNubException(pn_error=PNERR_GROUP_MISSING) + + def create_response(self, envelope): + return envelope + + def operation_type(self): + return PNOperationType.PNRemoveGroupOperation + + def name(self): + return "RemoveChannelGroup" diff --git a/tests/functional/test_remove_cg.py b/tests/functional/test_remove_cg.py new file mode 100644 index 00000000..42bd588b --- /dev/null +++ b/tests/functional/test_remove_cg.py @@ -0,0 +1,35 @@ +import unittest + +from pubnub.endpoints.channel_groups.remove_channel_group import RemoveChannelGroup + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestRemoveChannelGroup(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_ListChannelsInCGTest" + self.list = RemoveChannelGroup(self.pubnub) + + def test_list_channel_group(self): + self.list.channel_group('gr') + + self.assertEquals(self.list.build_path(), + RemoveChannelGroup.REMOVE_PATH % ( + pnconf.subscribe_key, "gr")) + + self.assertEqual(self.list.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + }) From e8ae6b20725fae50b6d5cc903b95895ea08cc453 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 08:21:29 -0700 Subject: [PATCH 127/468] Fix error message in add&reomve cg methods --- .../endpoints/channel_groups/add_channel_to_channel_group.py | 4 ++-- .../channel_groups/remove_channel_from_channel_group.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py index a34dd210..e6685178 100644 --- a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py +++ b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py @@ -2,7 +2,7 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_CHANNELS_MISSING +from pubnub.errors import PNERR_CHANNELS_MISSING, PNERR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType @@ -51,7 +51,7 @@ def validate_params(self): if not isinstance(self._channel_group, six.string_types)\ or len(self._channel_group) == 0: - raise PubNubException(pn_error=PNERR_CHANNELS_MISSING) + raise PubNubException(pn_error=PNERR_GROUP_MISSING) def create_response(self, envelope): return envelope diff --git a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py index 1505a9cf..ad7199c5 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py @@ -2,7 +2,7 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_CHANNELS_MISSING +from pubnub.errors import PNERR_CHANNELS_MISSING, PNERR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType @@ -51,7 +51,7 @@ def validate_params(self): if not isinstance(self._channel_group, six.string_types)\ or len(self._channel_group) == 0: - raise PubNubException(pn_error=PNERR_CHANNELS_MISSING) + raise PubNubException(pn_error=PNERR_GROUP_MISSING) def create_response(self, envelope): return envelope From bf8b6f0ecd54dba035fd9ed529d4b6c465b5ad86 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 22 Jun 2016 09:28:13 -0700 Subject: [PATCH 128/468] Add integrational Tornado channel group methods tests --- .../add_channel_to_channel_group.py | 3 +- .../list_channels_in_channel_group.py | 6 +- .../remove_channel_from_channel_group.py | 3 +- .../channel_groups/remove_channel_group.py | 3 +- pubnub/models/consumer/channel_group.py | 15 +++ pubnub/pubnub_tornado.py | 17 +++ .../tornado/test_channel_groups.py | 121 ++++++++++++++++++ 7 files changed, 164 insertions(+), 4 deletions(-) create mode 100644 pubnub/models/consumer/channel_group.py create mode 100644 tests/integrational/tornado/test_channel_groups.py diff --git a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py index e6685178..bd55b198 100644 --- a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py +++ b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py @@ -5,6 +5,7 @@ from pubnub.errors import PNERR_CHANNELS_MISSING, PNERR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult class AddChannelToChannelGroup(Endpoint): @@ -54,7 +55,7 @@ def validate_params(self): raise PubNubException(pn_error=PNERR_GROUP_MISSING) def create_response(self, envelope): - return envelope + return PNChannelGroupsAddChannelResult() def operation_type(self): return PNOperationType.PNAddChannelsToGroupOperation diff --git a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py index 2c1ae512..8b327386 100644 --- a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py +++ b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py @@ -4,6 +4,7 @@ from pubnub.errors import PNERR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.channel_group import PNChannelGroupsListResult class ListChannelsInChannelGroup(Endpoint): @@ -37,7 +38,10 @@ def validate_params(self): raise PubNubException(pn_error=PNERR_GROUP_MISSING) def create_response(self, envelope): - return envelope + if 'payload' in envelope and 'channels' in envelope['payload']: + return PNChannelGroupsListResult(envelope['payload']['channels']) + else: + return PNChannelGroupsListResult([]) def operation_type(self): return PNOperationType.PNChannelsForGroupOperation diff --git a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py index ad7199c5..2d9090c0 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py @@ -5,6 +5,7 @@ from pubnub.errors import PNERR_CHANNELS_MISSING, PNERR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.channel_group import PNChannelGroupsRemoveChannelResult class RemoveChannelFromChannelGroup(Endpoint): @@ -54,7 +55,7 @@ def validate_params(self): raise PubNubException(pn_error=PNERR_GROUP_MISSING) def create_response(self, envelope): - return envelope + return PNChannelGroupsRemoveChannelResult() def operation_type(self): return PNOperationType.PNRemoveChannelsFromGroupOperation diff --git a/pubnub/endpoints/channel_groups/remove_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_group.py index 19da5730..88bafae9 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_group.py @@ -4,6 +4,7 @@ from pubnub.errors import PNERR_GROUP_MISSING from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.channel_group import PNChannelGroupsRemoveGroupResult class RemoveChannelGroup(Endpoint): @@ -37,7 +38,7 @@ def validate_params(self): raise PubNubException(pn_error=PNERR_GROUP_MISSING) def create_response(self, envelope): - return envelope + return PNChannelGroupsRemoveGroupResult() def operation_type(self): return PNOperationType.PNRemoveGroupOperation diff --git a/pubnub/models/consumer/channel_group.py b/pubnub/models/consumer/channel_group.py new file mode 100644 index 00000000..79011baa --- /dev/null +++ b/pubnub/models/consumer/channel_group.py @@ -0,0 +1,15 @@ +class PNChannelGroupsAddChannelResult(object): + pass + + +class PNChannelGroupsRemoveChannelResult(object): + pass + + +class PNChannelGroupsRemoveGroupResult(object): + pass + + +class PNChannelGroupsListResult(object): + def __init__(self, channels): + self.channels = channels diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index f1515e40..00f075f4 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -6,12 +6,17 @@ from tornado.log import gen_log from tornado.simple_httpclient import SimpleAsyncHTTPClient + from . import utils from .endpoints.pubsub.leave import Leave from .workers import SubscribeMessageWorker from .endpoints.pubsub.subscribe import Subscribe from .endpoints.pubsub.set_state import SetState from .endpoints.pubsub.get_state import GetState +from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup +from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup +from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup +from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup from .managers import SubscriptionManager from .builders import SubscribeBuilder, UnsubscribeBuilder from .enums import PNStatusCategory @@ -130,6 +135,18 @@ def set_state(self): def get_state(self): return GetState(self) + def add_channel_to_channel_group(self): + return AddChannelToChannelGroup(self) + + def remove_channel_from_channel_group(self): + return RemoveChannelFromChannelGroup(self) + + def list_channels_in_channel_group(self): + return ListChannelsInChannelGroup(self) + + def remove_channel_group(self): + return RemoveChannelGroup(self) + # TODO: extract this into a separate class def request_sync(self, *args): raise NotImplementedError diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py new file mode 100644 index 00000000..3c97e2b8 --- /dev/null +++ b/tests/integrational/tornado/test_channel_groups.py @@ -0,0 +1,121 @@ +import tornado +from tornado.testing import AsyncHTTPTestCase, AsyncTestCase +from tornado import gen + +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ + PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult +from pubnub.pubnub_tornado import PubNubTornado +from tests import helper +from tests.helper import pnconf + + +class TestChannelGroups(AsyncTestCase): + def setUp(self): + super(TestChannelGroups, self).setUp() + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + + @tornado.testing.gen_test + def test_add_remove_single_channel(self): + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + + # add + env = yield self.pubnub.add_channel_to_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + yield gen.sleep(1) + + # list + env = yield self.pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 1 + assert env.result.channels[0] == ch + + # remove + env = yield self.pubnub.remove_channel_from_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) + + yield gen.sleep(1) + + # list + env = yield self.pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 0 + + self.pubnub.stop() + self.stop() + + @tornado.testing.gen_test + def test_add_remove_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + + # add + env = yield self.pubnub.add_channel_to_channel_group() \ + .channels([ch1, ch2]).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + yield gen.sleep(1) + + # list + env = yield self.pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 2 + assert ch1 in env.result.channels + assert ch2 in env.result.channels + + # remove + env = yield self.pubnub.remove_channel_from_channel_group() \ + .channels([ch1, ch2]).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) + + yield gen.sleep(1) + + # list + env = yield self.pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 0 + + self.pubnub.stop() + self.stop() + + @tornado.testing.gen_test + def test_add_channel_remove_group(self): + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + + # add + env = yield self.pubnub.add_channel_to_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + yield gen.sleep(1) + + # list + env = yield self.pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 1 + assert env.result.channels[0] == ch + + # remove group + env = yield self.pubnub.remove_channel_group().channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsRemoveGroupResult) + + yield gen.sleep(1) + + # list + env = yield self.pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 0 + + self.pubnub.stop() + self.stop() From 354a216b19684b979da374f36d2fd5ad616225e2 Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Wed, 22 Jun 2016 22:15:12 +0200 Subject: [PATCH 129/468] Added channel_group to here_now, added store and replicate to publish, added fire method, added mobile_gw_provision method --- pubnub.py | 87 ++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/pubnub.py b/pubnub.py index 4cf76291..1e605bdb 100755 --- a/pubnub.py +++ b/pubnub.py @@ -750,7 +750,7 @@ def leave_group(self, channel_group, callback=None, error=None): callback=self._return_wrapped_callback(callback), error=self._return_wrapped_callback(error)) - def publish(self, channel, message, callback=None, error=None): + def publish(self, channel, message, store=True, replicate=True, callback=None, error=None): """Publishes data on a channel. The publish() method is used to send a message to all subscribers of @@ -794,6 +794,9 @@ def publish(self, channel, message, callback=None, error=None): """ + norep = 'false' if replicate else 'true' + store = '1' if store else '0' + message = self.encrypt(message) ## Send Message @@ -805,10 +808,40 @@ def publish(self, channel, message, callback=None, error=None): channel, '0', message - ], 'urlparams': {'auth': self.auth_key, 'pnsdk': self.pnsdk}}, + ], 'urlparams': {'auth': self.auth_key, 'pnsdk': self.pnsdk, 'store': store, 'norep': norep}}, callback=self._return_wrapped_callback(callback), error=self._return_wrapped_callback(error)) + def fire(self, channel, message, callback=None, error=None): + return self.publish(channel=channel, message=message, callback=callback, error=error, store=False, replicate=False) + + def mobile_gw_provision(self, device_id, remove_device=False, callback=None, channel_to_add=None, channel_to_remove=None, gw_type=None, error=None): + allowed_gw_types = ['gcm', 'apns', 'mpns'] + + if gw_type is None: + gw_type = 'apns' + + if gw_type not in allowed_gw_types: + raise AttributeError('Invalid gw_type') + + if remove_device and (channel_to_add or channel_to_remove): + raise AttributeError('Can\'t add or remove channels while removing device') + + urlcomponents = ['v1', 'push', 'sub-key', self.subscribe_key, 'devices', device_id] + + if remove_device: + urlcomponents.append('remove') + + specific_urlparams = {'add': channel_to_add, 'remove': channel_to_remove, 'type': gw_type} + default_urlparams = {'auth': self.auth_key, 'pnsdk': self.pnsdk} + + urlparams = specific_urlparams + urlparams.update(default_urlparams) + + return self._request({'urlcomponents': urlcomponents, 'urlparams': urlparams}, + callback=self._return_wrapped_callback(callback), + error=self._return_wrapped_callback(error)) + def presence(self, channel, callback, error=None, connect=None, disconnect=None, reconnect=None): """Subscribe to presence events on a channel. @@ -1030,7 +1063,7 @@ def where_now(self, uuid=None, callback=None, error=None): callback=self._return_wrapped_callback(callback), error=self._return_wrapped_callback(error)) - def here_now(self, channel, uuids=True, state=False, + def here_now(self, channel=None, channel_group=None, uuids=True, state=False, callback=None, error=None): """Get here now data. @@ -1041,23 +1074,28 @@ def here_now(self, channel, uuids=True, state=False, Args: - channel: (string) (optional) - Specifies the channel name to return occupancy - results. If channel is not provided, here_now will - return data for all channels. - - callback: (optional) - A callback method should be passed to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado. + channel: (string) (optional) + Specifies the channel name to return occupancy + results. If channel is not provided, here_now will + return data for all channels. - error: (optional) - Optional variable. An error method can be passed - to the method. - If set, the api works in async mode. - Required argument when working with twisted or - tornado . + channel_group: (string) (optional) + Specifies the channel name to return occupancy + results. If channel is not provided, here_now will + return data for all channels. + + callback: (optional) + A callback method should be passed to the method. + If set, the api works in async mode. + Required argument when working with twisted or + tornado. + + error: (optional) + Optional variable. An error method can be passed + to the method. + If set, the api works in async mode. + Required argument when working with twisted or + tornado . Returns: Sync Mode: list @@ -1090,8 +1128,12 @@ def here_now(self, channel, uuids=True, state=False, 'sub_key', self.subscribe_key ] - if (channel is not None and len(channel) > 0): + if channel is not None and len(channel) > 0 or channel_group is not None and len(channel_group) > 0: urlcomponents.append('channel') + + if channel is None or len(channel) == 0: + channel = ',' + urlcomponents.append(channel) data = {'auth': self.auth_key, 'pnsdk': self.pnsdk} @@ -1102,6 +1144,9 @@ def here_now(self, channel, uuids=True, state=False, if uuids is False: data['disable_uuids'] = '1' + if channel_group is not None and len(channel_group) > 0: + data['channel-group'] = channel_group + ## Get Presence Here Now return self._request({"urlcomponents": urlcomponents, 'urlparams': data}, @@ -2550,6 +2595,8 @@ def init_poolmanager(self, *args, **kwargs): def _requests_request(url, timeout=15): + print(url) + try: resp = s.get(url, timeout=timeout) except requests.exceptions.HTTPError as http_error: From 349c84dfa81d7f50bdcc9f1bfe223b91c0f5b164 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 23 Jun 2016 21:16:55 -0700 Subject: [PATCH 130/468] noreplication & fire --- pubnub.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pubnub.py b/pubnub.py index 4cf76291..60d3bb19 100755 --- a/pubnub.py +++ b/pubnub.py @@ -750,7 +750,7 @@ def leave_group(self, channel_group, callback=None, error=None): callback=self._return_wrapped_callback(callback), error=self._return_wrapped_callback(error)) - def publish(self, channel, message, callback=None, error=None): + def publish(self, channel, message, store=True, replicate=True, callback=None, error=None): """Publishes data on a channel. The publish() method is used to send a message to all subscribers of @@ -794,9 +794,12 @@ def publish(self, channel, message, callback=None, error=None): """ + norep = 'false' if replicate else 'true' + store = '1' if store else '0' + message = self.encrypt(message) - ## Send Message + # Send Message return self._request({"urlcomponents": [ 'publish', self.publish_key, @@ -805,7 +808,7 @@ def publish(self, channel, message, callback=None, error=None): channel, '0', message - ], 'urlparams': {'auth': self.auth_key, 'pnsdk': self.pnsdk}}, + ], 'urlparams': {'auth': self.auth_key, 'pnsdk': self.pnsdk, 'store': store, 'norep': norep}}, callback=self._return_wrapped_callback(callback), error=self._return_wrapped_callback(error)) From 5f2cf032ab647981c66d55c96c4c00ab253f8829 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 23 Jun 2016 21:41:55 -0700 Subject: [PATCH 131/468] reduce mobile gateway for now --- pubnub.py | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/pubnub.py b/pubnub.py index cafc9ed7..abf9bf5d 100755 --- a/pubnub.py +++ b/pubnub.py @@ -815,33 +815,6 @@ def publish(self, channel, message, store=True, replicate=True, callback=None, e def fire(self, channel, message, callback=None, error=None): return self.publish(channel=channel, message=message, callback=callback, error=error, store=False, replicate=False) - def mobile_gw_provision(self, device_id, remove_device=False, callback=None, channel_to_add=None, channel_to_remove=None, gw_type=None, error=None): - allowed_gw_types = ['gcm', 'apns', 'mpns'] - - if gw_type is None: - gw_type = 'apns' - - if gw_type not in allowed_gw_types: - raise AttributeError('Invalid gw_type') - - if remove_device and (channel_to_add or channel_to_remove): - raise AttributeError('Can\'t add or remove channels while removing device') - - urlcomponents = ['v1', 'push', 'sub-key', self.subscribe_key, 'devices', device_id] - - if remove_device: - urlcomponents.append('remove') - - specific_urlparams = {'add': channel_to_add, 'remove': channel_to_remove, 'type': gw_type} - default_urlparams = {'auth': self.auth_key, 'pnsdk': self.pnsdk} - - urlparams = specific_urlparams - urlparams.update(default_urlparams) - - return self._request({'urlcomponents': urlcomponents, 'urlparams': urlparams}, - callback=self._return_wrapped_callback(callback), - error=self._return_wrapped_callback(error)) - def presence(self, channel, callback, error=None, connect=None, disconnect=None, reconnect=None): """Subscribe to presence events on a channel. @@ -1147,7 +1120,7 @@ def here_now(self, channel=None, channel_group=None, uuids=True, state=False, if channel_group is not None and len(channel_group) > 0: data['channel-group'] = channel_group - ## Get Presence Here Now + # Get Presence Here Now return self._request({"urlcomponents": urlcomponents, 'urlparams': data}, callback=self._return_wrapped_callback(callback), @@ -2595,8 +2568,6 @@ def init_poolmanager(self, *args, **kwargs): def _requests_request(url, timeout=15): - print(url) - try: resp = s.get(url, timeout=timeout) except requests.exceptions.HTTPError as http_error: From 56761223d1159868aa503de677de7a873eaa084e Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 23 Jun 2016 21:49:29 -0700 Subject: [PATCH 132/468] bump version --- VERSION | 2 +- pubnub.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index a0fc9e07..c77a7de8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.8 +3.7.9 diff --git a/pubnub.py b/pubnub.py index abf9bf5d..d1a50e28 100755 --- a/pubnub.py +++ b/pubnub.py @@ -305,7 +305,7 @@ def __init__( """ self.origin = origin - self.version = '3.7.8' + self.version = '3.7.9' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key From d96b6cc29c4e327992361b63cb3e8211bfbcace1 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 24 Jun 2016 11:08:00 -0700 Subject: [PATCH 133/468] restore push notification functions / 3.8.0 --- pubnub.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pubnub.py b/pubnub.py index d1a50e28..423a41dd 100755 --- a/pubnub.py +++ b/pubnub.py @@ -6,7 +6,7 @@ # http://www.pubnub.com/ # ----------------------------------- -# PubNub 3.7.8 Real-time Push Cloud API +# PubNub 3.8.0 Real-time Push Cloud API # ----------------------------------- @@ -305,7 +305,7 @@ def __init__( """ self.origin = origin - self.version = '3.7.9' + self.version = '3.8.0' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key @@ -815,6 +815,30 @@ def publish(self, channel, message, store=True, replicate=True, callback=None, e def fire(self, channel, message, callback=None, error=None): return self.publish(channel=channel, message=message, callback=callback, error=error, store=False, replicate=False) + def mobile_gw_provision(self, device_id, remove_device=False, callback=None, channel_to_add=None, channel_to_remove=None, gw_type='apns', error=None): + allowed_gw_types = ['gcm', 'apns', 'mpns'] + + if gw_type not in allowed_gw_types: + raise AttributeError('Invalid gw_type') + + if remove_device and (channel_to_add or channel_to_remove): + raise AttributeError('Can\'t add or remove channels while removing device') + + urlcomponents = ['v1', 'push', 'sub-key', self.subscribe_key, 'devices', device_id] + + if remove_device: + urlcomponents.append('remove') + + specific_urlparams = {'add': channel_to_add, 'remove': channel_to_remove, 'type': gw_type} + default_urlparams = {'auth': self.auth_key, 'pnsdk': self.pnsdk} + + urlparams = specific_urlparams + urlparams.update(default_urlparams) + + return self._request({'urlcomponents': urlcomponents, 'urlparams': urlparams}, + callback=self._return_wrapped_callback(callback), + error=self._return_wrapped_callback(error)) + def presence(self, channel, callback, error=None, connect=None, disconnect=None, reconnect=None): """Subscribe to presence events on a channel. From 9b09fb3af36ba14f6cc5b78534f5a098efa907ec Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 24 Jun 2016 11:41:42 -0700 Subject: [PATCH 134/468] extra version file --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c77a7de8..19811903 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.9 +3.8.0 From 79847980557377671c29b959fac54897ccbb14de Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 24 Jun 2016 11:50:14 -0700 Subject: [PATCH 135/468] bump up version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index a502c2a0..7ffbd56e 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='3.7.8', + version='3.8.0', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From eb4c033569ab58848768c4991e3e3280d2a68048 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 24 Jun 2016 11:58:27 -0700 Subject: [PATCH 136/468] changelog --- CHANGELOG | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d912c8ca..15c3c851 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,9 @@ +3.8.0 +. Mobile Gateway Functions. +. Here Now for channel groups +. no-rep, store and fire() + 3.7.7 - 02-10-2015 - 3012d7e . Adding .stop() method for base python async operations to exit the listener From 9fb239157af9946f4af0e32eecae4f67093d7415 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 04:33:37 -0700 Subject: [PATCH 137/468] Add herartbeat endpoint with functional tests; Implement presence messages heanling with integrational tests; Started working on heartbeat loop --- pubnub/endpoints/presence/heartbeat.py | 72 +++++++++++++ pubnub/endpoints/pubsub/set_state.py | 5 +- pubnub/enums.py | 11 ++ pubnub/managers.py | 29 ++++- pubnub/models/consumer/pubsub.py | 12 +-- pubnub/models/server/subscribe.py | 22 ++-- pubnub/models/subscription_item.py | 4 +- pubnub/pnconfiguration.py | 24 ++++- pubnub/pubnub_tornado.py | 85 ++++++++++++--- pubnub/utils.py | 4 +- tests/functional/test_heartbeat.py | 100 ++++++++++++++++++ tests/integrational/tornado/test_heartbeat.py | 59 +++++++++++ tests/integrational/tornado/test_here_now.py | 37 +------ tests/integrational/tornado/test_subscribe.py | 51 ++++++++- tests/integrational/tornado/tornado_helper.py | 91 ++++++++++++++++ 15 files changed, 531 insertions(+), 75 deletions(-) create mode 100644 pubnub/endpoints/presence/heartbeat.py create mode 100644 tests/functional/test_heartbeat.py create mode 100644 tests/integrational/tornado/test_heartbeat.py create mode 100644 tests/integrational/tornado/tornado_helper.py diff --git a/pubnub/endpoints/presence/heartbeat.py b/pubnub/endpoints/presence/heartbeat.py new file mode 100644 index 00000000..e6d6c662 --- /dev/null +++ b/pubnub/endpoints/presence/heartbeat.py @@ -0,0 +1,72 @@ +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING +from pubnub.exceptions import PubNubException + + +class Heartbeat(Endpoint): + # /v2/presence/sub-key//channel//heartbeat?uuid= + HEARTBEAT_PATH = "/v2/presence/sub-key/%s/channel/%s/heartbeat" + + def __init__(self, pubnub): + super(Heartbeat, self).__init__(pubnub) + self._channels = [] + self._groups = [] + self._state = None + + def channels(self, channels): + utils.extend_list(self._channels, channels) + + return self + + def channel_groups(self, channel_groups): + utils.extend_list(self._groups, channel_groups) + + return self + + def state(self, state): + self._state = state + + return self + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if len(self._channels) == 0 and len(self._groups) == 0: + raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) + + def build_path(self): + channels = utils.join_channels(self._channels) + return Heartbeat.HEARTBEAT_PATH % (self.pubnub.config.subscribe_key, channels) + + def build_params(self): + params = self.default_params() + + params['heartbeat'] = str(self.pubnub.config.presence_timeout) + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items(self._groups) + + if self._state is not None: + params['state'] = utils.write_value_as_string(self._state) + + return params + + def create_response(self, envelope): + return True + + def affected_channels(self): + return None + + def affected_channels_groups(self): + return None + + def operation_type(self): + return PNOperationType.PNHeartbeatOperation + + def name(self): + return "Heartbeat" diff --git a/pubnub/endpoints/pubsub/set_state.py b/pubnub/endpoints/pubsub/set_state.py index 01e2fa44..187ccf0e 100644 --- a/pubnub/endpoints/pubsub/set_state.py +++ b/pubnub/endpoints/pubsub/set_state.py @@ -1,12 +1,13 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_CHANNEL_OR_GROUP_MISSING, PNERR_STATE_MISSING, \ - PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET +from pubnub.errors import PNERR_STATE_MISSING, PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType from pubnub.models.consumer.presence import PNSetStateResult +# TODO: save state inside internal key/val storage + class SetState(Endpoint): # /v2/presence/sub-key//channel//uuid//data?state= SET_STATE_PATH = "/v2/presence/sub-key/%s/channel/%s/uuid/%s/data" diff --git a/pubnub/enums.py b/pubnub/enums.py index 306d1bc3..90b75275 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -53,3 +53,14 @@ class PNOperationType(object): PNGetState = 19 PNAccessManagerAudit = 20 PNAccessManagerGrant = 21 + + +class PNHeartbeatNotificationOptions(object): + NONE = 1 + FAILURES = 2 + ALL = 3 + + +class PNReconnectionPolicy(object): + NONE = 1 + LINEAR = 2 diff --git a/pubnub/managers.py b/pubnub/managers.py index 545d88d3..5129b0de 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -65,6 +65,19 @@ def adapt_unsubscribe_builder(self, unsubscribe_operation): self._groups.pop(group) self._presence_groups.pop(group) + def state_payload(self): + state = {} + + for channel in self._channels.values(): + if channel.state is not None: + state[channel.name] = channel.state + + for group in self._groups.values(): + if group.state is not None: + state[group.name] = group.state + + return state + @staticmethod def _prepare_membership_list(data_storage, presence_storage, include_presence): response = [] @@ -108,6 +121,8 @@ def announce_presence(self, presence): class SubscriptionManager(object): __metaclass__ = ABCMeta + HEARTBEAT_INTERVAL_MULTIPLIER = 1000 + def __init__(self, pubnub_instance): self._pubnub = pubnub_instance self._subscription_status_announced = False @@ -144,6 +159,14 @@ def _start_subscribe_loop(self): def _stop_subscribe_loop(self): pass + @abstractmethod + def _stop_heartbeat_timer(self): + pass + + @abstractmethod + def _perform_heartbeat_loop(self): + pass + @abstractmethod def _send_leave(self, unsubscribe_operation): pass @@ -213,10 +236,6 @@ def _handle_endpoint_call(self, raw_result, status): self._region = int(result.metadata.region) self._start_subscribe_loop() - # TODO: implement - def _stop_heartbeat_timer(self): - pass - # TODO: implement def _register_heartbeat_timer(self): - pass + self._stop_heartbeat_timer() diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index 5020de25..bcd31b64 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -23,12 +23,12 @@ class PNPresenceEventResult(object): def __init__(self, event, uuid, timestamp, occupancy, subscribed_channel, actual_channel, timetoken, user_metadata=None): - assert isinstance(event, str) - assert isinstance(uuid, str) - assert isinstance(timestamp, long) - assert isinstance(occupancy, int) - assert isinstance(actual_channel, str) - assert isinstance(timetoken, long) + assert isinstance(event, six.string_types) + assert isinstance(uuid, six.string_types) + assert isinstance(timestamp, six.integer_types) + assert isinstance(occupancy, six.integer_types) + assert isinstance(actual_channel, six.string_types) + assert isinstance(timetoken, six.integer_types) if user_metadata is not None: assert isinstance(user_metadata, object) diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 8970922e..d422d350 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -42,7 +42,8 @@ def from_json(cls, json_input): message.channel = json_input['c'] message.payload = json_input['d'] message.flags = json_input['f'] - message.issuing_client_id = json_input['i'] + if 'i' in json_input: + message.issuing_client_id = json_input['i'] message.subscribe_key = json_input['k'] if 'o' in json_input: message.origination_timetoken = json_input['o'] @@ -66,20 +67,29 @@ def from_json(cls, json_input): class PresenceEnvelope: - def __init__(self, action, uuid, occupancy, timestamp): - assert isinstance(action, str) - assert isinstance(uuid, str) - assert isinstance(occupancy, int) + def __init__(self, action, uuid, occupancy, timestamp, data=None): + assert isinstance(action, six.string_types) + assert isinstance(uuid, six.string_types) + assert isinstance(occupancy, six.integer_types) assert isinstance(timestamp, six.integer_types) + if data is not None: + assert isinstance(data, dict) self.action = action self.uuid = uuid self.occupancy = occupancy self.timestamp = timestamp + self.data = data @classmethod def from_json_payload(cls, json): - return False + return PresenceEnvelope( + action=json['action'], + uuid=json['uuid'], + occupancy=json['occupancy'], + timestamp=json['timestamp'], + data=json['data'] if 'data' in json else None + ) # TODO: refactor this file to server.py diff --git a/pubnub/models/subscription_item.py b/pubnub/models/subscription_item.py index 11ff2db3..ec59e586 100644 --- a/pubnub/models/subscription_item.py +++ b/pubnub/models/subscription_item.py @@ -1,4 +1,4 @@ class SubscriptionItem(object): - def __init__(self, name=None, object=None): + def __init__(self, name=None, state=None): self.name = name - self.object = object + self.state = state diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 2059de67..9c45a06d 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -1,10 +1,10 @@ +from .enums import PNHeartbeatNotificationOptions, PNReconnectionPolicy from . import utils class PNConfiguration(object): def __init__(self): # TODO: add validation - self.presence_timeout = 300 self.uuid = None self.origin = "pubsub.pubnub.com" self.ssl = False @@ -17,6 +17,13 @@ def __init__(self): self.auth_key = None self.filter_expression = None self.enable_subscribe = True + self.heartbeat_notification_options = PNHeartbeatNotificationOptions.FAILURES + self.reconnect_policy = PNReconnectionPolicy.NONE + + self._presence_timeout = None + self._heartbeat_interval = None + + self.set_presence_timeout(10) def validate(self): assert self.uuid is None or isinstance(self.uuid, str) @@ -36,5 +43,20 @@ def scheme_extended(self): def scheme_and_host(self): return self.scheme_extended() + self.origin + def set_presence_timeout_with_custom_interval(self, timeout, interval): + self._presence_timeout = timeout + self._heartbeat_interval = interval + + def set_presence_timeout(self, timeout): + self.set_presence_timeout_with_custom_interval(timeout, (timeout / 2) - 1) + + @property + def presence_timeout(self): + return self._presence_timeout + + @property + def heartbeat_interval(self): + return self._heartbeat_interval + # TODO: set log level # TODO: set log level diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 00f075f4..b857573a 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -5,11 +5,12 @@ import datetime from tornado.log import gen_log from tornado.simple_httpclient import SimpleAsyncHTTPClient - +from tornado.ioloop import PeriodicCallback from . import utils -from .endpoints.pubsub.leave import Leave from .workers import SubscribeMessageWorker +from .endpoints.pubsub.leave import Leave +from .endpoints.presence.heartbeat import Heartbeat from .endpoints.pubsub.subscribe import Subscribe from .endpoints.pubsub.set_state import SetState from .endpoints.pubsub.get_state import GetState @@ -19,7 +20,7 @@ from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup from .managers import SubscriptionManager from .builders import SubscribeBuilder, UnsubscribeBuilder -from .enums import PNStatusCategory +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions from .structures import ResponseInfo from .exceptions import PubNubException from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED @@ -28,6 +29,7 @@ import tornado.httpclient import tornado.ioloop import tornado.gen +from tornado import stack_context from tornado.concurrent import Future from tornado.queues import Queue from tornado.locks import Event, Semaphore @@ -123,6 +125,9 @@ def add_listener(self, listener): else: raise Exception("Subscription manager is not enabled for this instance") + def heartbeat(self): + return Heartbeat(self) + def subscribe(self): return SubscribeBuilder(self._subscription_manager) @@ -246,6 +251,8 @@ def response_callback(response): else: data = "N/A" + logger.debug(data) + if response.error is not None: if response.code >= 500: err = PNERR_SERVER_ERROR @@ -293,7 +300,7 @@ def response_callback(response): class TornadoSubscribeMessageWorker(SubscribeMessageWorker): @tornado.gen.coroutine def run(self): - yield self._take_message() + self._take_message() @tornado.gen.coroutine def _take_message(self): @@ -307,11 +314,6 @@ def _take_message(self): except tornado.gen.TimeoutError: i += 1 continue - # TODO: should context of callback be changed to not affect on this loop? - # errors are skipped for now - # TODO:check http://www.tornadoweb.org/en/stable/ioloop.html#tornado.ioloop.IOLoop.handle_callback_exception - except Exception as e: - print("!!! ex", str(e)) class TornadoSubscriptionManager(SubscriptionManager): @@ -320,6 +322,7 @@ def __init__(self, pubnub_instance): self._consumer_event = Event() self._subscription_lock = Semaphore(1) self._current_request_key_object = None + self._task = None super(TornadoSubscriptionManager, self).__init__(pubnub_instance) def _set_consumer_event(self): @@ -329,10 +332,12 @@ def _message_queue_put(self, message): self._message_queue.put(message) def _start_worker(self): - self._consumer = TornadoSubscribeMessageWorker(self._pubnub, self._listener_manager, - self._message_queue, self._consumer_event) - - self._pubnub.ioloop.spawn_callback(self._consumer.run) + self._consumer = TornadoSubscribeMessageWorker(self._pubnub, + self._listener_manager, + self._message_queue, + self._consumer_event) + run = stack_context.wrap(self._consumer.run) + self._pubnub.ioloop.spawn_callback(run) @tornado.gen.coroutine def _start_subscribe_loop(self): @@ -370,6 +375,60 @@ def _start_subscribe_loop(self): def _stop_subscribe_loop(self): self._pubnub.http.reset_request(self._current_request_key_object) + def _stop_heartbeat_timer(self): + if self._task is not None: + self._task.stop() + + def _register_heartbeat_timer(self): + super(TornadoSubscriptionManager, self)._register_heartbeat_timer() + + self._task = PeriodicCallback(self._perform_heartbeat_loop, + self._pubnub.config.heartbeat_interval * + TornadoSubscriptionManager.HEARTBEAT_INTERVAL_MULTIPLIER, + self._pubnub.ioloop) + self._task.start() + + def _perform_heartbeat_loop(self): + if self._heartbeat_call is not None: + # TODO: cancel call + pass + + cancellation_event = Event() + state_payload = self._subscription_state.state_payload() + presence_channels = self._subscription_state.prepare_channel_list(False) + presence_groups = self._subscription_state.prepare_channel_group_list(False) + + if len(presence_channels) == 0 and len(presence_groups) == 0: + return + + try: + key_object, heartbeat = yield self._pubnub.heartbeat() \ + .channels(presence_channels) \ + .channel_groups(presence_groups) \ + .state(state_payload) \ + .cancellation_event(cancellation_event) \ + .future(intermediate_key_future=True) + + self._current_request_key_object = key_object + envelope = yield heartbeat + + heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options + if envelope.status.is_error: + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + self._listener_manager.announce_stateus(envelope.status) + else: + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + self._listener_manager.announce_stateus(envelope.status) + + except PubNubTornadoException as e: + if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: + self._start_subscribe_loop() + else: + self._listener_manager.announce_status(e.status) + finally: + cancellation_event.set() + @tornado.gen.coroutine def _send_leave(self, unsubscribe_operation): envelope = yield Leave(self._pubnub) \ diff --git a/pubnub/utils.py b/pubnub/utils.py index 66599f52..98727c5a 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -51,11 +51,11 @@ def get_data_for_user(data): def write_value_as_string(data): try: - if isinstance(data, str): + if isinstance(data, six.string_types): return ("\"%s\"" % data).replace("+", "%20") else: return json.dumps(data).replace("+", "%20") - except TypeError as e: + except TypeError: raise PubNubException( pn_error=PNERR_JSON_NOT_SERIALIZABLE ) diff --git a/tests/functional/test_heartbeat.py b/tests/functional/test_heartbeat.py new file mode 100644 index 00000000..801979be --- /dev/null +++ b/tests/functional/test_heartbeat.py @@ -0,0 +1,100 @@ +import unittest + +import json + +from pubnub.endpoints.presence.heartbeat import Heartbeat + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestHeartbeat(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name + ) + self.pubnub.uuid = "UUID_HeartbeatUnitTest" + self.hb = Heartbeat(self.pubnub) + self.pubnub.config.set_presence_timeout(20) + + def test_sub_single_channel(self): + self.hb.channels('ch') + + self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH + % (pnconf.subscribe_key, 'ch')) + + self.assertEqual(self.hb.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'heartbeat': '20' + }) + + self.assertEqual(self.hb._channels, ['ch']) + + def test_hb_multiple_channels_using_list(self): + self.hb.channels(['ch1', 'ch2', 'ch3']) + + self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH + % (pnconf.subscribe_key, "ch1,ch2,ch3")) + + self.assertEqual(self.hb.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'heartbeat': '20' + }) + + self.assertEqual(self.hb._channels, ['ch1', 'ch2', 'ch3']) + + def test_hb_single_group(self): + self.hb.channel_groups("gr") + + self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.hb.build_params(), { + 'channel-group': 'gr', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'heartbeat': '20' + }) + + self.assertEqual(self.hb._groups, ['gr']) + + def test_hb_multiple_groups_using_list(self): + self.hb.channel_groups(['gr1', 'gr2', 'gr3']) + + self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH + % (pnconf.subscribe_key, ",")) + + self.assertEqual(self.hb.build_params(), { + 'channel-group': 'gr1,gr2,gr3', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'heartbeat': '20' + }) + + self.assertEqual(self.hb._groups, ['gr1', 'gr2', 'gr3']) + + def test_hb_with_state(self): + state = {"name": "Alex", "count": 7} + self.hb.channels('ch1,ch2').state(state) + + self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH + % (pnconf.subscribe_key, "ch1,ch2")) + + self.assertEqual(self.hb.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'heartbeat': '20', + 'state': json.dumps(state) + }) + + self.assertEqual(self.hb._groups, []) + self.assertEqual(self.hb._channels, ['ch1', 'ch2']) diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py new file mode 100644 index 00000000..fb57327e --- /dev/null +++ b/tests/integrational/tornado/test_heartbeat.py @@ -0,0 +1,59 @@ +import logging +import pubnub as pn + +from tornado.testing import AsyncTestCase +from pubnub.callbacks import SubscribeCallback +from pubnub.pubnub_tornado import PubNubTornado +from tests import helper +from tests.helper import pnconf + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch1 = "ch1" +ch2 = "ch2" + + +class SubscriptionTest(object): + def __init__(self): + super(SubscriptionTest, self).__init__() + self.pubnub = None + +# Heartbeat test steps: +# - set hb timeout to 10 +# - connect to :ch-pnpres +# - connect to :ch +# - assert join event +# - block hb requests +# - assert disconnect on 11 second + + +class TestSubscribeUnsubscribe(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestSubscribeUnsubscribe, self).setUp() + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + + def test_do(self): + _test = self + + class MyCallback(SubscribeCallback): + def message(self, pubnub, result): + pass + + def status(self, pubnub, status): + if helper.is_subscribed_event(status): + _test.io_loop.add_callback(_test._unsubscribe) + elif helper.is_unsubscribed_event(status): + pubnub.stop() + _test.stop() + + def presence(self, pubnub, presence): + pass + + callback = MyCallback() + self.pubnub.add_listener(callback) + self.pubnub.subscribe().channels("ch1").execute() + self.pubnub.start() + self.wait() + + def _unsubscribe(self): + self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 31a8ee1a..8a172f52 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -1,46 +1,11 @@ import tornado from tornado import gen -from tornado.locks import Event from tornado.testing import AsyncHTTPTestCase, AsyncTestCase -from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado from tests import helper from tests.helper import pnconf - - -class ConnectionEvent(SubscribeCallback): - def __init__(self, event, expected_status_checker): - self.event = event - self.expected_status_checker = expected_status_checker - - def status(self, pubnub, status): - if self.expected_status_checker(status): - self.event.set() - - def presence(self, pubnub, presence): - pass - - def message(self, pubnub, message): - pass - - -@tornado.gen.coroutine -def connect_to_channel(pubnub, channel): - event = Event() - callback = ConnectionEvent(event, helper.is_subscribed_event) - pubnub.add_listener(callback) - pubnub.subscribe().channels(channel).execute() - yield event.wait() - - -@tornado.gen.coroutine -def disconnect_from_channel(pubnub, channel): - event = Event() - callback = ConnectionEvent(event, helper.is_unsubscribed_event) - pubnub.add_listener(callback) - pubnub.unsubscribe().channels(channel).execute() - yield event.wait() +from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel class TestPubNubAsyncHereNow(AsyncTestCase): diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index afd30c8b..37436a16 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -1,4 +1,9 @@ import logging +from copy import copy + +import tornado +from tornado.locks import Event + import pubnub as pn from tornado.testing import AsyncTestCase @@ -6,6 +11,7 @@ from pubnub.pubnub_tornado import PubNubTornado from tests import helper from tests.helper import pnconf +from tests.integrational.tornado.tornado_helper import ExtendedSubscribeCallback pn.set_stream_logger('pubnub', logging.DEBUG) @@ -83,7 +89,7 @@ def message(self, pubnub, result): def status(self, pubnub, status): if helper.is_subscribed_event(status): - _test.io_loop.add_callback(_test._unsubscribe) + _test.io_loop.add_callback(_test.unsubscribe) elif helper.is_unsubscribed_event(status): pubnub.stop() _test.stop() @@ -97,5 +103,46 @@ def presence(self, pubnub, presence): self.pubnub.start() self.wait() - def _unsubscribe(self): + def unsubscribe(self): self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() + + +class TestPresenceJoinLeave(AsyncTestCase, SubscriptionTest): + @tornado.testing.gen_test(timeout=15) + def test_do(self): + self.pubnub = PubNubTornado(copy(pnconf), custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(copy(pnconf), custom_ioloop=self.io_loop) + self.pubnub.config.uuid = helper.gen_channel("messenger") + self.pubnub_listener.config.uuid = helper.gen_channel("listener") + callback_presence = ExtendedSubscribeCallback() + self.pubnub_listener.add_listener(callback_presence) + self.pubnub_listener.subscribe().channels("ch1").with_presence().execute() + yield callback_presence.wait_for_connect() + + envelope = yield callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'join' + assert envelope.uuid == self.pubnub_listener.uuid + + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels("ch1").execute() + yield callback_messages.wait_for_connect() + + envelope = yield callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'join' + assert envelope.uuid == self.pubnub.uuid + + self.pubnub.unsubscribe().channels("ch1").execute() + yield callback_messages.wait_for_disconnect() + + envelope = yield callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'leave' + assert envelope.uuid == self.pubnub.uuid + + self.pubnub_listener.unsubscribe().channels("ch1").execute() + yield callback_presence.wait_for_disconnect() + self.pubnub.stop() + self.stop() diff --git a/tests/integrational/tornado/tornado_helper.py b/tests/integrational/tornado/tornado_helper.py new file mode 100644 index 00000000..2193749c --- /dev/null +++ b/tests/integrational/tornado/tornado_helper.py @@ -0,0 +1,91 @@ +from tornado.locks import Event +from tornado import gen +from tornado.queues import Queue + +from pubnub.callbacks import SubscribeCallback +from tests import helper + + +class ConnectionEvent(SubscribeCallback): + def __init__(self, event, expected_status_checker): + self.event = event + self.expected_status_checker = expected_status_checker + + def status(self, pubnub, status): + if self.expected_status_checker(status): + self.event.set() + + def presence(self, pubnub, presence): + pass + + def message(self, pubnub, message): + pass + + +class ExtendedSubscribeCallback(SubscribeCallback): + def __init__(self): + self.connected = False + self.connected_event = Event() + self.disconnected_event = Event() + self.presence_queue = Queue() + self.message_queue = Queue() + + def status(self, pubnub, status): + if helper.is_subscribed_event(status) and not self.connected_event.is_set(): + self.connected_event.set() + elif helper.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): + self.disconnected_event.set() + + def message(self, pubnub, message): + pass + + def presence(self, pubnub, presence): + self.presence_queue.put(presence) + + @gen.coroutine + def wait_for_connect(self): + if not self.connected_event.is_set(): + yield self.connected_event.wait() + else: + raise Exception("instance is already connected") + + @gen.coroutine + def wait_for_disconnect(self): + if not self.disconnected_event.is_set(): + yield self.disconnected_event.wait() + else: + raise Exception("instance is already disconnected") + + @gen.coroutine + def wait_for_presence_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = yield self.presence_queue.get() + if env.actual_channel[:-7] in channel_names: + raise gen.Return(env) + else: + continue + finally: + self.presence_queue.task_done() + if not self.connected_event.is_set(): + yield self.connected_event.wait() + + +@gen.coroutine +def connect_to_channel(pubnub, channel): + event = Event() + callback = ConnectionEvent(event, helper.is_subscribed_event) + pubnub.add_listener(callback) + pubnub.subscribe().channels(channel).execute() + yield event.wait() + + +@gen.coroutine +def disconnect_from_channel(pubnub, channel): + event = Event() + callback = ConnectionEvent(event, helper.is_unsubscribed_event) + pubnub.add_listener(callback) + pubnub.unsubscribe().channels(channel).execute() + yield event.wait() + From 10c2cb0e543c11fdc2fcddc9440c234ab0806cad Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 04:55:51 -0700 Subject: [PATCH 138/468] Refactor subscribe tests --- tests/helper.py | 5 + tests/integrational/tornado/test_subscribe.py | 133 ++++++++---------- 2 files changed, 61 insertions(+), 77 deletions(-) diff --git a/tests/helper.py b/tests/helper.py index 8438863d..1f0e7c7f 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -3,6 +3,7 @@ import string import random +from copy import copy from pubnub import utils from pubnub.enums import PNOperationType, PNStatusCategory @@ -33,6 +34,10 @@ pnconf_enc_sub.subscribe_key = sub_key pnconf_enc_sub.cipher_key = "testKey" + +def pnconf_copy(): + return copy(pnconf) + sdk_name = "Python-UnitTest" diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 37436a16..3cb7aed4 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -1,16 +1,12 @@ import logging -from copy import copy - import tornado -from tornado.locks import Event - import pubnub as pn from tornado.testing import AsyncTestCase from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado from tests import helper -from tests.helper import pnconf +from tests.helper import pnconf, pnconf_copy from tests.integrational.tornado.tornado_helper import ExtendedSubscribeCallback pn.set_stream_logger('pubnub', logging.DEBUG) @@ -23,6 +19,61 @@ class SubscriptionTest(object): def __init__(self): super(SubscriptionTest, self).__init__() self.pubnub = None + self.pubnub_listener = None + + +class TestSubscription(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestSubscription, self).setUp() + self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + + @tornado.testing.gen_test() + def test_subscribe_unsubscribe(self): + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels("ch1").execute() + yield callback_messages.wait_for_connect() + + self.pubnub.unsubscribe().channels("ch1").execute() + yield callback_messages.wait_for_disconnect() + + @tornado.testing.gen_test() + def test_join_leave(self): + self.pubnub.config.uuid = helper.gen_channel("messenger") + self.pubnub_listener.config.uuid = helper.gen_channel("listener") + callback_presence = ExtendedSubscribeCallback() + self.pubnub_listener.add_listener(callback_presence) + self.pubnub_listener.subscribe().channels("ch1").with_presence().execute() + yield callback_presence.wait_for_connect() + + envelope = yield callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'join' + assert envelope.uuid == self.pubnub_listener.uuid + + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels("ch1").execute() + yield callback_messages.wait_for_connect() + + envelope = yield callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'join' + assert envelope.uuid == self.pubnub.uuid + + self.pubnub.unsubscribe().channels("ch1").execute() + yield callback_messages.wait_for_disconnect() + + envelope = yield callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'leave' + assert envelope.uuid == self.pubnub.uuid + + self.pubnub_listener.unsubscribe().channels("ch1").execute() + yield callback_presence.wait_for_disconnect() + self.pubnub.stop() + self.stop() class TestMultipleChannelSubscriptions(AsyncTestCase, SubscriptionTest): @@ -74,75 +125,3 @@ def _unsubscribe(self): def _unsubscribe2(self): self.pubnub.unsubscribe().channels(["ch3"]).execute() - -class TestSubscribeUnsubscribe(AsyncTestCase, SubscriptionTest): - def setUp(self): - super(TestSubscribeUnsubscribe, self).setUp() - self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) - - def test_do(self): - _test = self - - class MyCallback(SubscribeCallback): - def message(self, pubnub, result): - pass - - def status(self, pubnub, status): - if helper.is_subscribed_event(status): - _test.io_loop.add_callback(_test.unsubscribe) - elif helper.is_unsubscribed_event(status): - pubnub.stop() - _test.stop() - - def presence(self, pubnub, presence): - pass - - callback = MyCallback() - self.pubnub.add_listener(callback) - self.pubnub.subscribe().channels("ch1").execute() - self.pubnub.start() - self.wait() - - def unsubscribe(self): - self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() - - -class TestPresenceJoinLeave(AsyncTestCase, SubscriptionTest): - @tornado.testing.gen_test(timeout=15) - def test_do(self): - self.pubnub = PubNubTornado(copy(pnconf), custom_ioloop=self.io_loop) - self.pubnub_listener = PubNubTornado(copy(pnconf), custom_ioloop=self.io_loop) - self.pubnub.config.uuid = helper.gen_channel("messenger") - self.pubnub_listener.config.uuid = helper.gen_channel("listener") - callback_presence = ExtendedSubscribeCallback() - self.pubnub_listener.add_listener(callback_presence) - self.pubnub_listener.subscribe().channels("ch1").with_presence().execute() - yield callback_presence.wait_for_connect() - - envelope = yield callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" - assert envelope.event == 'join' - assert envelope.uuid == self.pubnub_listener.uuid - - callback_messages = ExtendedSubscribeCallback() - self.pubnub.add_listener(callback_messages) - self.pubnub.subscribe().channels("ch1").execute() - yield callback_messages.wait_for_connect() - - envelope = yield callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" - assert envelope.event == 'join' - assert envelope.uuid == self.pubnub.uuid - - self.pubnub.unsubscribe().channels("ch1").execute() - yield callback_messages.wait_for_disconnect() - - envelope = yield callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" - assert envelope.event == 'leave' - assert envelope.uuid == self.pubnub.uuid - - self.pubnub_listener.unsubscribe().channels("ch1").execute() - yield callback_presence.wait_for_disconnect() - self.pubnub.stop() - self.stop() From d6a25026d7d6ea3faaba00d50663ab7280445ebe Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 05:05:19 -0700 Subject: [PATCH 139/468] Move presence-related endpoints from pubsub to presence folder --- .../{pubsub => presence}/get_state.py | 0 .../endpoints/{pubsub => presence}/leave.py | 0 .../{pubsub => presence}/set_state.py | 0 pubnub/pubnub_tornado.py | 41 ++++++++++--------- tests/functional/test_get_state.py | 2 +- tests/functional/test_leave.py | 2 +- tests/functional/test_set_state.py | 2 +- 7 files changed, 24 insertions(+), 23 deletions(-) rename pubnub/endpoints/{pubsub => presence}/get_state.py (100%) rename pubnub/endpoints/{pubsub => presence}/leave.py (100%) rename pubnub/endpoints/{pubsub => presence}/set_state.py (100%) diff --git a/pubnub/endpoints/pubsub/get_state.py b/pubnub/endpoints/presence/get_state.py similarity index 100% rename from pubnub/endpoints/pubsub/get_state.py rename to pubnub/endpoints/presence/get_state.py diff --git a/pubnub/endpoints/pubsub/leave.py b/pubnub/endpoints/presence/leave.py similarity index 100% rename from pubnub/endpoints/pubsub/leave.py rename to pubnub/endpoints/presence/leave.py diff --git a/pubnub/endpoints/pubsub/set_state.py b/pubnub/endpoints/presence/set_state.py similarity index 100% rename from pubnub/endpoints/pubsub/set_state.py rename to pubnub/endpoints/presence/set_state.py diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index b857573a..ab453b55 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -3,37 +3,38 @@ import logging import time import datetime + +import tornado.gen +import tornado.httpclient +import tornado.ioloop +from tornado import ioloop +from tornado import stack_context +from tornado.concurrent import Future +from tornado.ioloop import PeriodicCallback +from tornado.locks import Event, Semaphore from tornado.log import gen_log +from tornado.queues import Queue from tornado.simple_httpclient import SimpleAsyncHTTPClient -from tornado.ioloop import PeriodicCallback + from . import utils -from .workers import SubscribeMessageWorker -from .endpoints.pubsub.leave import Leave -from .endpoints.presence.heartbeat import Heartbeat -from .endpoints.pubsub.subscribe import Subscribe -from .endpoints.pubsub.set_state import SetState -from .endpoints.pubsub.get_state import GetState +from .builders import SubscribeBuilder, UnsubscribeBuilder from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup -from .managers import SubscriptionManager -from .builders import SubscribeBuilder, UnsubscribeBuilder +from .endpoints.presence.heartbeat import Heartbeat +from .endpoints.presence.set_state import SetState +from .endpoints.presence.get_state import GetState +from .endpoints.presence.leave import Leave +from .endpoints.pubsub.subscribe import Subscribe from .enums import PNStatusCategory, PNHeartbeatNotificationOptions -from .structures import ResponseInfo -from .exceptions import PubNubException from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED +from .exceptions import PubNubException +from .managers import SubscriptionManager from .pubnub_core import PubNubCore - -import tornado.httpclient -import tornado.ioloop -import tornado.gen -from tornado import stack_context -from tornado.concurrent import Future -from tornado.queues import Queue -from tornado.locks import Event, Semaphore -from tornado import ioloop +from .structures import ResponseInfo +from .workers import SubscribeMessageWorker logger = logging.getLogger("pubnub") diff --git a/tests/functional/test_get_state.py b/tests/functional/test_get_state.py index fb565bab..c2ef7f29 100644 --- a/tests/functional/test_get_state.py +++ b/tests/functional/test_get_state.py @@ -1,6 +1,6 @@ import unittest -from pubnub.endpoints.pubsub.get_state import GetState +from pubnub.endpoints.presence.get_state import GetState try: from mock import MagicMock diff --git a/tests/functional/test_leave.py b/tests/functional/test_leave.py index e28baa21..dc441097 100644 --- a/tests/functional/test_leave.py +++ b/tests/functional/test_leave.py @@ -1,6 +1,6 @@ import unittest -from pubnub.endpoints.pubsub.leave import Leave +from pubnub.endpoints.presence.leave import Leave try: from mock import MagicMock diff --git a/tests/functional/test_set_state.py b/tests/functional/test_set_state.py index c29db19d..85421143 100644 --- a/tests/functional/test_set_state.py +++ b/tests/functional/test_set_state.py @@ -1,7 +1,7 @@ import json import unittest -from pubnub.endpoints.pubsub.set_state import SetState +from pubnub.endpoints.presence.set_state import SetState try: from mock import MagicMock From 48091e3d623ff297d8a85f263f1030d7256b1f3d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 05:38:04 -0700 Subject: [PATCH 140/468] Extract callback-based tornado subscribe tests to separate file --- tests/integrational/tornado/test_subscribe.py | 54 +------------- .../tornado/test_subscribe_cb.py | 71 +++++++++++++++++++ 2 files changed, 72 insertions(+), 53 deletions(-) create mode 100644 tests/integrational/tornado/test_subscribe_cb.py diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 3cb7aed4..28bdad94 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -3,10 +3,9 @@ import pubnub as pn from tornado.testing import AsyncTestCase -from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado from tests import helper -from tests.helper import pnconf, pnconf_copy +from tests.helper import pnconf_copy from tests.integrational.tornado.tornado_helper import ExtendedSubscribeCallback pn.set_stream_logger('pubnub', logging.DEBUG) @@ -74,54 +73,3 @@ def test_join_leave(self): yield callback_presence.wait_for_disconnect() self.pubnub.stop() self.stop() - - -class TestMultipleChannelSubscriptions(AsyncTestCase, SubscriptionTest): - def setUp(self): - super(TestMultipleChannelSubscriptions, self).setUp() - self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) - - def test_do(self): - _test = self - - class MyCallback(SubscribeCallback): - def __init__(self): - self.subscribe = False - self.unsubscribe = False - - def message(self, pubnub, result): - _test.io_loop.add_callback(_test._unsubscribe) - - def status(self, pubnub, status): - # connect event triggers only once, but probably should be triggered once for each channel - # TODO collect 3 subscribe - # TODO collect 3 unsubscribe - if helper.is_subscribed_event(status): - self.subscribe = True - _test.io_loop.add_callback(_test._publish) - elif helper.is_unsubscribed_event(status): - self.unsubscribe = True - pubnub.stop() - _test.stop() - - def presence(self, pubnub, presence): - pass - - callback = MyCallback() - self.pubnub.add_listener(callback) - self.pubnub.subscribe().channels("ch1").execute() - self.pubnub.subscribe().channels("ch2").execute() - self.pubnub.subscribe().channels("ch3").execute() - - self.wait() - - def _publish(self): - self.pubnub.publish().channel("ch2").message("hey").future() - - def _unsubscribe(self): - self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() - self.io_loop.add_callback(self._unsubscribe2) - - def _unsubscribe2(self): - self.pubnub.unsubscribe().channels(["ch3"]).execute() - diff --git a/tests/integrational/tornado/test_subscribe_cb.py b/tests/integrational/tornado/test_subscribe_cb.py new file mode 100644 index 00000000..f4116ff6 --- /dev/null +++ b/tests/integrational/tornado/test_subscribe_cb.py @@ -0,0 +1,71 @@ +import logging +import pubnub as pn + +from tornado.testing import AsyncTestCase +from pubnub.callbacks import SubscribeCallback +from pubnub.pubnub_tornado import PubNubTornado +from tests import helper +from tests.helper import pnconf_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch1 = "ch1" +ch2 = "ch2" + + +class SubscriptionTest(object): + def __init__(self): + super(SubscriptionTest, self).__init__() + self.pubnub = None + self.pubnub_listener = None + + +class TestMultipleChannelSubscriptions(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestMultipleChannelSubscriptions, self).setUp() + self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + + def test_do(self): + _test = self + + class MyCallback(SubscribeCallback): + def __init__(self): + self.subscribe = False + self.unsubscribe = False + + def message(self, pubnub, result): + _test.io_loop.add_callback(_test._unsubscribe) + + def status(self, pubnub, status): + # connect event triggers only once, but probably should be triggered once for each channel + # TODO collect 3 subscribe + # TODO collect 3 unsubscribe + if helper.is_subscribed_event(status): + self.subscribe = True + _test.io_loop.add_callback(_test._publish) + elif helper.is_unsubscribed_event(status): + self.unsubscribe = True + pubnub.stop() + _test.stop() + + def presence(self, pubnub, presence): + pass + + callback = MyCallback() + self.pubnub.add_listener(callback) + self.pubnub.subscribe().channels("ch1").execute() + self.pubnub.subscribe().channels("ch2").execute() + self.pubnub.subscribe().channels("ch3").execute() + + self.wait() + + def _publish(self): + self.pubnub.publish().channel("ch2").message("hey").future() + + def _unsubscribe(self): + self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() + self.io_loop.add_callback(self._unsubscribe2) + + def _unsubscribe2(self): + self.pubnub.unsubscribe().channels(["ch3"]).execute() + From 32bf4ab0449cc525e3f16a4b3706f8a22f632226 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 09:42:26 -0700 Subject: [PATCH 141/468] Add sub/pub/unsub Tornado test --- pubnub/managers.py | 7 +++++ pubnub/models/server/subscribe.py | 1 + pubnub/workers.py | 10 +++++++ tests/integrational/tornado/test_subscribe.py | 28 +++++++++++++++++-- tests/integrational/tornado/tornado_helper.py | 17 +++++++++-- 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index 5129b0de..aa725555 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -35,6 +35,10 @@ def is_empty(self): return len(self._channels) == 0 and len(self._groups) == 0 and\ len(self._presence_channels) == 0 and len(self._presence_groups) == 0 + def subscribed_to_the_only_channel(self): + return len(self._channels) == 1 and len(self._groups) == 0 and\ + len(self._presence_channels) == 0 and len(self._presence_groups) == 0 + def prepare_channel_list(self, include_presence): return StateManager._prepare_membership_list( self._channels, self._presence_channels, include_presence) @@ -227,8 +231,11 @@ def _handle_endpoint_call(self, raw_result, status): self._listener_manager.announce_status(pn_status) result = SubscribeEnvelope.from_json(raw_result) + only_channel = self._subscription_state.subscribed_to_the_only_channel() if result.messages is not None and len(result.messages) > 0: for message in result.messages: + if only_channel: + message.only_channel_subscription = True self._message_queue_put(message) # REVIEW: is int compatible with long for Python 2 diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index d422d350..263dd96b 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -32,6 +32,7 @@ def __init__(self): self.subscribe_key = None self.origination_timetoken = None self.publish_metadata = None + self.only_channel_subscription = False @classmethod def from_json(cls, json_input): diff --git a/pubnub/workers.py b/pubnub/workers.py index 0546a589..3c9d2aa8 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -39,6 +39,12 @@ def _process_incoming_payload(self, message): subscription_match = message.subscription_match publish_meta_data = message.publish_metadata + # if channel == subscription_match: + # subscription_match = None + + # if message.only_channel_subscription: + # channel = subscription_match + if "-pnpres" in message.channel: presence_payload = PresenceEnvelope.from_json_payload(message.payload) pn_presence_event_result = PNPresenceEventResult( @@ -63,4 +69,8 @@ def _process_incoming_payload(self, message): subscribed_channel=(subscription_match if subscription_match is not None else channel), timetoken=publish_meta_data.publish_timetoken ) + + if message.only_channel_subscription: + pn_message_result.actual_channel = pn_message_result.subscribed_channel + self._listener_manager.announce_message(pn_message_result) diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 28bdad94..808dc222 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -21,9 +21,9 @@ def __init__(self): self.pubnub_listener = None -class TestSubscription(AsyncTestCase, SubscriptionTest): +class TestChannelSubscription(AsyncTestCase, SubscriptionTest): def setUp(self): - super(TestSubscription, self).setUp() + super(TestChannelSubscription, self).setUp() self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) @@ -37,6 +37,30 @@ def test_subscribe_unsubscribe(self): self.pubnub.unsubscribe().channels("ch1").execute() yield callback_messages.wait_for_disconnect() + @tornado.testing.gen_test(timeout=30) + def test_subscribe_publish_unsubscribe(self): + ch = helper.gen_channel("subscribe-test") + message = "hey" + + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels(ch).execute() + yield callback_messages.wait_for_connect() + + sub_env, pub_env = yield [ + callback_messages.wait_for_message_on(ch), + self.pubnub.publish().channel(ch).message(message).future()] + + assert pub_env.status.original_response[0] == 1 + assert pub_env.status.original_response[1] == 'Sent' + + assert sub_env.actual_channel == ch + assert sub_env.subscribed_channel == ch + assert sub_env.message == message + + self.pubnub.unsubscribe().channels("ch1").execute() + yield callback_messages.wait_for_disconnect() + @tornado.testing.gen_test() def test_join_leave(self): self.pubnub.config.uuid = helper.gen_channel("messenger") diff --git a/tests/integrational/tornado/tornado_helper.py b/tests/integrational/tornado/tornado_helper.py index 2193749c..2e98492d 100644 --- a/tests/integrational/tornado/tornado_helper.py +++ b/tests/integrational/tornado/tornado_helper.py @@ -37,7 +37,7 @@ def status(self, pubnub, status): self.disconnected_event.set() def message(self, pubnub, message): - pass + self.message_queue.put(message) def presence(self, pubnub, presence): self.presence_queue.put(presence) @@ -56,6 +56,19 @@ def wait_for_disconnect(self): else: raise Exception("instance is already disconnected") + @gen.coroutine + def wait_for_message_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = yield self.message_queue.get() + if env.actual_channel in channel_names: + raise gen.Return(env) + else: + continue + finally: + self.message_queue.task_done() + @gen.coroutine def wait_for_presence_on(self, *channel_names): channel_names = list(channel_names) @@ -68,8 +81,6 @@ def wait_for_presence_on(self, *channel_names): continue finally: self.presence_queue.task_done() - if not self.connected_event.is_set(): - yield self.connected_event.wait() @gen.coroutine From 6060195584bc70fe0fa7794d67f11ed1b161ad6d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 10:42:11 -0700 Subject: [PATCH 142/468] Add test CG subscribe/unsubscribe --- pubnub/builders.py | 13 +++------ pubnub/endpoints/pubsub/subscribe.py | 14 +++------ pubnub/managers.py | 6 ++-- tests/integrational/tornado/test_subscribe.py | 29 +++++++++++++++++++ 4 files changed, 41 insertions(+), 21 deletions(-) diff --git a/pubnub/builders.py b/pubnub/builders.py index 43de84c8..6c021297 100644 --- a/pubnub/builders.py +++ b/pubnub/builders.py @@ -1,8 +1,6 @@ from abc import ABCMeta, abstractmethod - -import six - from .dtos import SubscribeOperation, UnsubscribeOperation +import utils class PubSubBuilder(object): @@ -14,16 +12,13 @@ def __init__(self, subscription_manager): self._channel_group_subscriptions = [] def channels(self, channels_list): - if isinstance(channels_list, six.string_types): - self._channel_subscriptions.append(channels_list) - elif isinstance(channels_list, (list, dict)): - self._channel_subscriptions.extend(channels_list) + utils.extend_list(self._channel_subscriptions, channels_list) return self def channel_groups(self, channel_groups_list): - # TODO: do the same if block as for channels - self._channel_group_subscriptions.extend(channel_groups_list) + utils.extend_list(self._channel_group_subscriptions, channel_groups_list) + return self @abstractmethod diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index c2c98466..7ebbb1d3 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -20,18 +20,12 @@ def __init__(self, pubnub): self._with_presence = None def channels(self, channels): - if isinstance(channels, (list, tuple)): - self._channels.extend(channels) - else: - self._channels.extend(utils.split_items(channels)) + utils.extend_list(self._channels, channels) return self - def channel_groups(self, channel_groups): - if isinstance(channel_groups, (list, tuple)): - self._groups.extend(channel_groups) - else: - self._groups.extend(utils.split_items(channel_groups)) + def channel_groups(self, groups): + utils.extend_list(self._groups, groups) return self @@ -60,7 +54,7 @@ def validate_params(self): raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) def build_path(self): - channels = "," if len(self._channels) is 0 else utils.join_items(self._channels) + channels = utils.join_channels(self._channels) return Subscribe.SUBSCRIBE_PATH % (self.pubnub.config.subscribe_key, channels) def build_params(self): diff --git a/pubnub/managers.py b/pubnub/managers.py index aa725555..dc3f9a88 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -63,11 +63,13 @@ def adapt_subscribe_builder(self, subscribe_operation): def adapt_unsubscribe_builder(self, unsubscribe_operation): for channel in unsubscribe_operation.channels: self._channels.pop(channel, None) - self._presence_channels.pop(channel, None) + if channel in self._presence_channels: + self._presence_channels.pop(channel, None) for group in unsubscribe_operation.channel_groups: self._groups.pop(group) - self._presence_groups.pop(group) + if group in self._presence_groups: + self._presence_groups.pop(group) def state_payload(self): state = {} diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 808dc222..3503a282 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -3,6 +3,7 @@ import pubnub as pn from tornado.testing import AsyncTestCase +from tornado import gen from pubnub.pubnub_tornado import PubNubTornado from tests import helper from tests.helper import pnconf_copy @@ -97,3 +98,31 @@ def test_join_leave(self): yield callback_presence.wait_for_disconnect() self.pubnub.stop() self.stop() + + +class TestChannelGroupSubscription(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestChannelGroupSubscription, self).setUp() + self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + + @tornado.testing.gen_test(timeout=30) + def test_subscribe_unsubscribe(self): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscirbe-group") + + envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + yield gen.sleep(1) + + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channel_groups(gr).execute() + yield callback_messages.wait_for_connect() + + self.pubnub.unsubscribe().channel_groups(gr).execute() + yield callback_messages.wait_for_disconnect() + + envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 From df02e6bdc6f3afaec27827848f2eecd77d22835f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 11:52:05 -0700 Subject: [PATCH 143/468] Add Torando CG sub/pub/unsub test --- pubnub/models/consumer/pubsub.py | 1 + tests/integrational/tornado/test_subscribe.py | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index bcd31b64..b71a159b 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -13,6 +13,7 @@ def __init__(self, message, subscribed_channel, actual_channel, timetoken, user_ assert isinstance(user_metadata, object) self.message = message + # RENAME: Confusing name (can be channel, wildcard channel or group) self.subscribed_channel = subscribed_channel self.actual_channel = actual_channel self.timetoken = timetoken diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 3503a282..33d63458 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -126,3 +126,36 @@ def test_subscribe_unsubscribe(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + + @tornado.testing.gen_test(timeout=30) + def test_subscribe_publish_unsubscribe(self): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscirbe-group") + message = "hey" + + envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + yield gen.sleep(1) + + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channel_groups(gr).execute() + yield callback_messages.wait_for_connect() + + sub_envelope, pub_envelope = yield [ + callback_messages.wait_for_message_on(ch), + self.pubnub.publish().channel(ch).message(message).future()] + + assert pub_envelope.status.original_response[0] == 1 + assert pub_envelope.status.original_response[1] == 'Sent' + + assert sub_envelope.actual_channel == ch + assert sub_envelope.subscribed_channel == gr + assert sub_envelope.message == message + + self.pubnub.unsubscribe().channel_groups(gr).execute() + yield callback_messages.wait_for_disconnect() + + envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 From e4e5035fb6e1b4fb28f38aeee097f0b63f54a6ab Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 26 Jun 2016 12:29:06 -0700 Subject: [PATCH 144/468] Add Tornado CG join/leave tst --- tests/integrational/tornado/test_subscribe.py | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 33d63458..61036904 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -159,3 +159,60 @@ def test_subscribe_publish_unsubscribe(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + + @tornado.testing.gen_test(timeout=30) + def test_join_leave(self): + self.pubnub.config.uuid = helper.gen_channel("messenger") + self.pubnub_listener.config.uuid = helper.gen_channel("listener") + + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscirbe-group") + + envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + yield gen.sleep(1) + + callback_messages = ExtendedSubscribeCallback() + callback_presence = ExtendedSubscribeCallback() + + self.pubnub_listener.add_listener(callback_presence) + self.pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() + yield callback_presence.wait_for_connect() + + prs_envelope = yield callback_presence.wait_for_presence_on(ch) + assert prs_envelope.event == 'join' + assert prs_envelope.uuid == self.pubnub_listener.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channel_groups(gr).execute() + + useless, prs_envelope = yield [ + callback_messages.wait_for_connect(), + callback_presence.wait_for_presence_on(ch) + ] + + assert prs_envelope.event == 'join' + assert prs_envelope.uuid == self.pubnub.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + self.pubnub.unsubscribe().channel_groups(gr).execute() + + useless, prs_envelope = yield [ + callback_messages.wait_for_disconnect(), + callback_presence.wait_for_presence_on(ch) + ] + + assert prs_envelope.event == 'leave' + assert prs_envelope.uuid == self.pubnub.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + self.pubnub_listener.unsubscribe().channel_groups(gr).execute() + yield callback_presence.wait_for_disconnect() + + envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 From 3f3f5c514d4cee00381f8383fb30501098f3aa47 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 27 Jun 2016 13:00:15 -0700 Subject: [PATCH 145/468] Add Tornado heartbeat test --- pubnub/endpoints/endpoint.py | 11 +- pubnub/endpoints/presence/heartbeat.py | 8 +- pubnub/endpoints/presence/leave.py | 6 ++ pubnub/endpoints/pubsub/subscribe.py | 9 ++ pubnub/pnconfiguration.py | 13 ++- pubnub/pubnub_tornado.py | 46 ++++---- pubnub/structures.py | 11 +- tests/integrational/tornado/test_heartbeat.py | 102 +++++++++++------- 8 files changed, 136 insertions(+), 70 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index e6655c8e..f5e88a20 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -54,6 +54,14 @@ def operation_type(self): def name(self): pass + @abstractmethod + def request_timeout(self): + pass + + @abstractmethod + def connect_timeout(self): + pass + def affected_channels(self): return None @@ -62,7 +70,8 @@ def affected_channels_groups(self): def options(self): return RequestOptions(self.build_path(), self.build_params(), - self.http_method(), self.build_data()) + self.http_method(), self.request_timeout(), + self.connect_timeout(), self.build_data()) def sync(self): self.validate_params() diff --git a/pubnub/endpoints/presence/heartbeat.py b/pubnub/endpoints/presence/heartbeat.py index e6d6c662..3aaf605e 100644 --- a/pubnub/endpoints/presence/heartbeat.py +++ b/pubnub/endpoints/presence/heartbeat.py @@ -51,7 +51,7 @@ def build_params(self): if len(self._groups) > 0: params['channel-group'] = utils.join_items(self._groups) - if self._state is not None: + if self._state is not None and len(self._state) > 0: params['state'] = utils.write_value_as_string(self._state) return params @@ -65,6 +65,12 @@ def affected_channels(self): def affected_channels_groups(self): return None + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNHeartbeatOperation diff --git a/pubnub/endpoints/presence/leave.py b/pubnub/endpoints/presence/leave.py index 10104f96..c3926843 100644 --- a/pubnub/endpoints/presence/leave.py +++ b/pubnub/endpoints/presence/leave.py @@ -59,6 +59,12 @@ def affected_channels(self): def affected_channels_groups(self): return self._groups + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNUnsubscribeOperation diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index 7ebbb1d3..fea523a8 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -72,6 +72,9 @@ def build_params(self): if self._region is not None: params['tr'] = self._region + if not self.pubnub.config.heartbeat_default_values: + params['heartbeat'] = self.pubnub.config.presence_timeout + return params def create_response(self, envelope): @@ -83,6 +86,12 @@ def affected_channels(self): def affected_channels_groups(self): return None + def request_timeout(self): + return self.pubnub.config.subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNSubscribeOperation diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 9c45a06d..24047b58 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -3,13 +3,16 @@ class PNConfiguration(object): + DEFAULT_PRESENCE_TIMEOUT = 300 + DEFAULT_HEARTBEAT_INTERVAL = 280 + def __init__(self): # TODO: add validation self.uuid = None self.origin = "pubsub.pubnub.com" self.ssl = False self.non_subscribe_request_timeout = 10 - self.subscribe_timeout = 310 + self.subscribe_request_timeout = 310 self.connect_timeout = 5 self.subscribe_key = None self.publish_key = None @@ -20,10 +23,9 @@ def __init__(self): self.heartbeat_notification_options = PNHeartbeatNotificationOptions.FAILURES self.reconnect_policy = PNReconnectionPolicy.NONE - self._presence_timeout = None - self._heartbeat_interval = None - - self.set_presence_timeout(10) + self.heartbeat_default_values = True + self._presence_timeout = PNConfiguration.DEFAULT_PRESENCE_TIMEOUT + self._heartbeat_interval = PNConfiguration.DEFAULT_HEARTBEAT_INTERVAL def validate(self): assert self.uuid is None or isinstance(self.uuid, str) @@ -44,6 +46,7 @@ def scheme_and_host(self): return self.scheme_extended() + self.origin def set_presence_timeout_with_custom_interval(self, timeout, interval): + self.heartbeat_default_values = False self._presence_timeout = timeout self._heartbeat_interval = interval diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index ab453b55..68e3029d 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -16,7 +16,6 @@ from tornado.queues import Queue from tornado.simple_httpclient import SimpleAsyncHTTPClient - from . import utils from .builders import SubscribeBuilder, UnsubscribeBuilder from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup @@ -197,8 +196,8 @@ def request_future_key(self, options_func, create_response, method=options.method_string, headers=self.headers, body=options.data if options.data is not None else None, - connect_timeout=self.config.connect_timeout, - request_timeout=self.config.non_subscribe_request_timeout) + connect_timeout=options.connect_timeout, + request_timeout=options.request_timeout) def key_callback(key_response): future = Future() @@ -323,7 +322,7 @@ def __init__(self, pubnub_instance): self._consumer_event = Event() self._subscription_lock = Semaphore(1) self._current_request_key_object = None - self._task = None + self._heartbeat_periodic_callback = None super(TornadoSubscriptionManager, self).__init__(pubnub_instance) def _set_consumer_event(self): @@ -340,6 +339,11 @@ def _start_worker(self): run = stack_context.wrap(self._consumer.run) self._pubnub.ioloop.spawn_callback(run) + def reconnect(self): + self._should_stop = False + self._pubnub.ioloop.add_callback(self._start_subscribe_loop) + self._register_heartbeat_timer() + @tornado.gen.coroutine def _start_subscribe_loop(self): self._stop_subscribe_loop() @@ -366,7 +370,7 @@ def _start_subscribe_loop(self): self._handle_endpoint_call(envelope.result, envelope.status) except PubNubTornadoException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: - self._start_subscribe_loop() + self._pubnub.ioloop.add_callback(self._start_subscribe_loop) else: self._listener_manager.announce_status(e.status) finally: @@ -377,18 +381,20 @@ def _stop_subscribe_loop(self): self._pubnub.http.reset_request(self._current_request_key_object) def _stop_heartbeat_timer(self): - if self._task is not None: - self._task.stop() + if self._heartbeat_periodic_callback is not None: + self._heartbeat_periodic_callback.stop() def _register_heartbeat_timer(self): super(TornadoSubscriptionManager, self)._register_heartbeat_timer() - self._task = PeriodicCallback(self._perform_heartbeat_loop, - self._pubnub.config.heartbeat_interval * - TornadoSubscriptionManager.HEARTBEAT_INTERVAL_MULTIPLIER, - self._pubnub.ioloop) - self._task.start() + self._heartbeat_periodic_callback = PeriodicCallback( + stack_context.wrap(self._perform_heartbeat_loop), + self._pubnub.config.heartbeat_interval * + TornadoSubscriptionManager.HEARTBEAT_INTERVAL_MULTIPLIER, + self._pubnub.ioloop) + self._heartbeat_periodic_callback.start() + @tornado.gen.coroutine def _perform_heartbeat_loop(self): if self._heartbeat_call is not None: # TODO: cancel call @@ -403,15 +409,12 @@ def _perform_heartbeat_loop(self): return try: - key_object, heartbeat = yield self._pubnub.heartbeat() \ + envelope = yield self._pubnub.heartbeat() \ .channels(presence_channels) \ .channel_groups(presence_groups) \ .state(state_payload) \ .cancellation_event(cancellation_event) \ - .future(intermediate_key_future=True) - - self._current_request_key_object = key_object - envelope = yield heartbeat + .future() heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: @@ -423,10 +426,11 @@ def _perform_heartbeat_loop(self): self._listener_manager.announce_stateus(envelope.status) except PubNubTornadoException as e: - if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: - self._start_subscribe_loop() - else: - self._listener_manager.announce_status(e.status) + pass + # if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: + # self._start_subscribe_loop() + # else: + # self._listener_manager.announce_status(e.status) finally: cancellation_event.set() diff --git a/pubnub/structures.py b/pubnub/structures.py index 25267b12..03db13b0 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -1,18 +1,23 @@ -# TODO: choose a better name for this module +import six + from . import utils from .enums import HttpMethod class RequestOptions(object): - def __init__(self, path, params, method, data=None): + def __init__(self, path, params, method, request_timeout, connect_timeout, data=None): assert len(path) > 0 assert len(params) > 0 - assert isinstance(method, int) + assert isinstance(method, six.integer_types) + assert isinstance(request_timeout, six.integer_types) + assert isinstance(connect_timeout, six.integer_types) assert method is HttpMethod.GET or method is HttpMethod.POST self.path = path self.params = params self._method = method + self.request_timeout = request_timeout + self.connect_timeout = connect_timeout # TODO: rename to 'body' self.data = data diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py index fb57327e..4e8d4f5c 100644 --- a/tests/integrational/tornado/test_heartbeat.py +++ b/tests/integrational/tornado/test_heartbeat.py @@ -1,11 +1,13 @@ import logging +import tornado.testing import pubnub as pn from tornado.testing import AsyncTestCase -from pubnub.callbacks import SubscribeCallback +from tornado import gen from pubnub.pubnub_tornado import PubNubTornado from tests import helper -from tests.helper import pnconf +from tests.helper import pnconf_copy +from tests.integrational.tornado.tornado_helper import ExtendedSubscribeCallback pn.set_stream_logger('pubnub', logging.DEBUG) @@ -17,43 +19,65 @@ class SubscriptionTest(object): def __init__(self): super(SubscriptionTest, self).__init__() self.pubnub = None + self.pubnub_listener = None -# Heartbeat test steps: -# - set hb timeout to 10 -# - connect to :ch-pnpres -# - connect to :ch -# - assert join event -# - block hb requests -# - assert disconnect on 11 second - -class TestSubscribeUnsubscribe(AsyncTestCase, SubscriptionTest): +class TestChannelSubscription(AsyncTestCase, SubscriptionTest): def setUp(self): - super(TestSubscribeUnsubscribe, self).setUp() - self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) - - def test_do(self): - _test = self - - class MyCallback(SubscribeCallback): - def message(self, pubnub, result): - pass - - def status(self, pubnub, status): - if helper.is_subscribed_event(status): - _test.io_loop.add_callback(_test._unsubscribe) - elif helper.is_unsubscribed_event(status): - pubnub.stop() - _test.stop() - - def presence(self, pubnub, presence): - pass - - callback = MyCallback() - self.pubnub.add_listener(callback) - self.pubnub.subscribe().channels("ch1").execute() - self.pubnub.start() - self.wait() - - def _unsubscribe(self): - self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() + super(TestChannelSubscription, self).setUp() + + messenger_config = pnconf_copy() + messenger_config.set_presence_timeout(8) + messenger_config.uuid = helper.gen_channel("messenger") + + listener_config = pnconf_copy() + listener_config.uuid = helper.gen_channel("listener") + + self.pubnub = PubNubTornado(messenger_config, custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(listener_config, custom_ioloop=self.io_loop) + self.pubnub.config.uuid = helper.gen_channel("messenger") + self.pubnub_listener.config.uuid = helper.gen_channel("listener") + + @tornado.testing.gen_test(timeout=20) + def test_timeout_event_on_broken_heartbeat(self): + ch = helper.gen_channel("heartbeat-test") + + # - connect to :ch-pnpres + callback_presence = ExtendedSubscribeCallback() + self.pubnub_listener.add_listener(callback_presence) + self.pubnub_listener.subscribe().channels(ch).with_presence().execute() + yield callback_presence.wait_for_connect() + + envelope = yield callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == envelope.actual_channel + assert 'join' == envelope.event + assert self.pubnub_listener.uuid == envelope.uuid + + # - connect to :ch + callback_messages = ExtendedSubscribeCallback() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels(ch).execute() + + # - assert join event + useless, prs_envelope = yield [ + callback_messages.wait_for_connect(), + callback_presence.wait_for_presence_on(ch)] + assert ch + "-pnpres" == prs_envelope.actual_channel + assert 'join' == prs_envelope.event + assert self.pubnub.uuid == prs_envelope.uuid + + # wait for one heartbeat call + yield gen.sleep(8) + + # - break messenger heartbeat loop + self.pubnub._subscription_manager._stop_heartbeat_timer() + + # - assert for timeout + envelope = yield callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == envelope.actual_channel + assert 'timeout' == envelope.event + assert self.pubnub.uuid == envelope.uuid + + # - disconnect from :ch-pnpres + self.pubnub_listener.unsubscribe().channels(ch).execute() + yield callback_presence.wait_for_disconnect() From dfefc83b68ee1624e48cdacf11017281df6eea79 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 27 Jun 2016 22:59:03 -0700 Subject: [PATCH 146/468] Fix Tornado functional tests --- pubnub/builders.py | 2 +- .../channel_groups/add_channel_to_channel_group.py | 6 ++++++ .../channel_groups/list_channels_in_channel_group.py | 6 ++++++ .../channel_groups/remove_channel_from_channel_group.py | 6 ++++++ pubnub/endpoints/channel_groups/remove_channel_group.py | 6 ++++++ pubnub/endpoints/presence/get_state.py | 6 ++++++ pubnub/endpoints/presence/herenow.py | 6 ++++++ pubnub/endpoints/presence/set_state.py | 6 ++++++ pubnub/endpoints/pubsub/publish.py | 6 ++++++ tests/functional/test_heartbeat.py | 4 ++-- 10 files changed, 51 insertions(+), 3 deletions(-) diff --git a/pubnub/builders.py b/pubnub/builders.py index 6c021297..60f205aa 100644 --- a/pubnub/builders.py +++ b/pubnub/builders.py @@ -1,6 +1,6 @@ from abc import ABCMeta, abstractmethod from .dtos import SubscribeOperation, UnsubscribeOperation -import utils +from . import utils class PubSubBuilder(object): diff --git a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py index bd55b198..a335915a 100644 --- a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py +++ b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py @@ -57,6 +57,12 @@ def validate_params(self): def create_response(self, envelope): return PNChannelGroupsAddChannelResult() + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNAddChannelsToGroupOperation diff --git a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py index 8b327386..28d68f29 100644 --- a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py +++ b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py @@ -43,6 +43,12 @@ def create_response(self, envelope): else: return PNChannelGroupsListResult([]) + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNChannelsForGroupOperation diff --git a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py index 2d9090c0..094db3a0 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py @@ -57,6 +57,12 @@ def validate_params(self): def create_response(self, envelope): return PNChannelGroupsRemoveChannelResult() + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNRemoveChannelsFromGroupOperation diff --git a/pubnub/endpoints/channel_groups/remove_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_group.py index 88bafae9..e0228cf9 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_group.py @@ -40,6 +40,12 @@ def validate_params(self): def create_response(self, envelope): return PNChannelGroupsRemoveGroupResult() + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNRemoveGroupOperation diff --git a/pubnub/endpoints/presence/get_state.py b/pubnub/endpoints/presence/get_state.py index 92d01b47..558f3edc 100644 --- a/pubnub/endpoints/presence/get_state.py +++ b/pubnub/endpoints/presence/get_state.py @@ -58,6 +58,12 @@ def affected_channels(self): def affected_channels_groups(self): return self._groups + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNGetState diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 310b11e6..9cd2eb47 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -61,6 +61,12 @@ def validate_params(self): def create_response(self, envelope): return PNHereNowResult.from_json(envelope, self._channels) + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNPublishOperation diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index 187ccf0e..4360fccc 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -73,6 +73,12 @@ def affected_channels(self): def affected_channels_groups(self): return self._groups + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNSetStateOperation diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 8f6e2e9e..51ff9a85 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -126,6 +126,12 @@ def affected_channels(self): def affected_channels_groups(self): return None + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + def operation_type(self): return PNOperationType.PNPublishOperation diff --git a/tests/functional/test_heartbeat.py b/tests/functional/test_heartbeat.py index 801979be..56c6bdc2 100644 --- a/tests/functional/test_heartbeat.py +++ b/tests/functional/test_heartbeat.py @@ -10,14 +10,14 @@ from unittest.mock import MagicMock from pubnub.pubnub import PubNub -from tests.helper import pnconf, sdk_name +from tests.helper import pnconf, sdk_name, pnconf_copy class TestHeartbeat(unittest.TestCase): def setUp(self): self.pubnub = MagicMock( spec=PubNub, - config=pnconf, + config=pnconf_copy(), sdk_name=sdk_name ) self.pubnub.uuid = "UUID_HeartbeatUnitTest" From 31e77b0d90aea98c6e234e0c63c9650a62904ec1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 29 Jun 2016 22:50:11 -0700 Subject: [PATCH 147/468] Fix Threads basic subscribe behaviour --- pubnub/pubnub.py | 52 +++++++++++++++++--- tests/integrational/native/test_subscribe.py | 11 +++-- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index d1edebad..22d540e0 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -37,8 +37,12 @@ def sdk_platform(self): return "" def request_sync(self, options): - res = self.pn_request(self.session, self.config.scheme_and_host(), self.headers, options, - self.config.connect_timeout, self.config.non_subscribe_request_timeout) + res = self.pn_request(self.session, + self.config.scheme_and_host(), + self.headers, + options, + self.config.connect_timeout, + self.config.non_subscribe_request_timeout) # http error if res.status_code != requests.codes.ok: @@ -131,7 +135,11 @@ def error_callback(e): callback(status_category, None, None, e) call.executed_cb() - client = AsyncHTTPClient(self, success_callback, error_callback, options, cancellation_event) + client = AsyncHTTPClient(self, + success_callback, + error_callback, + options, + cancellation_event) thread = threading.Thread( target=client.run, @@ -169,9 +177,21 @@ def pn_request(self, session, scheme_and_host, headers, options, connect_timeout if options.is_post(): args['data'] = options.data - logger.debug("%s %s %s %s" % (options.method_string, url, options.params, options.data)) + logger.debug("%s %s %s" % ( + options.method_string, + utils.build_url( + self.config.scheme(), + self.config.origin, + options.path, + options.query_string), options.data)) else: - logger.debug("%s %s %s" % (options.method_string, url, options.params)) + logger.debug("%s %s" % ( + options.method_string, + utils.build_url( + self.config.scheme(), + self.config.origin, + options.path, + options.query_string))) # connection error try: @@ -224,13 +244,19 @@ def run(self): self.pubnub.config.connect_timeout, self.pubnub.config.non_subscribe_request_timeout) - if self.cancellation_event.isSet(): + if self.cancellation_event is not None and self.cancellation_event.isSet(): # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call return self.success(res) except PubNubException as e: self.error(e) + except Exception as e: + # TODO: log the exception + self.error(PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg="Exception in request thread: %s" % str(e) + )) class Call(object): @@ -249,7 +275,8 @@ def cancel(self): only after ongoing request will be finished :return: nothing """ - self.cancellation_event.set() + if self.cancellation_event is not None: + self.cancellation_event.set() self.is_canceled = True def join(self): @@ -261,6 +288,15 @@ def executed_cb(self): class NativeSubscriptionManager(SubscriptionManager): + def _send_leave(self, unsubscribe_operation): + pass + + def _perform_heartbeat_loop(self): + pass + + def _stop_heartbeat_timer(self): + pass + def __init__(self, pubnub_instance): self._message_queue = utils.Queue() self._consumer_event = threading.Event() @@ -302,7 +338,7 @@ def callback(raw_result, status): try: self._subscribe_call = Subscribe(self._pubnub) \ - .channels(combined_channels).groups(combined_groups) \ + .channels(combined_channels).channel_groups(combined_groups) \ .timetoken(self._timetoken).region(self._region) \ .filter_expression(self._pubnub.config.filter_expression) \ .async(callback) diff --git a/tests/integrational/native/test_subscribe.py b/tests/integrational/native/test_subscribe.py index 25ccb5a7..7ff9961b 100644 --- a/tests/integrational/native/test_subscribe.py +++ b/tests/integrational/native/test_subscribe.py @@ -1,8 +1,5 @@ import logging import unittest - -# import pydevd as pydevd - import pubnub from pubnub.callbacks import SubscribeCallback from pubnub.exceptions import PubNubException @@ -26,10 +23,16 @@ def __init__(self, l): assert isinstance(l, CountDownLatch) self._latch = l self.done = False + self.once = False self.msg = None def status(self, p, status): - p.publish().channel('ch1').message('hey').sync() + if not self.once: + self.once = True + p.publish().channel('ch1').message('hey').sync() + + if status.is_error(): + print("error here") def presence(self, p, presence): pass From 51d2ddc23a979d380801b972aab906698d52106d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 29 Jun 2016 23:15:28 -0700 Subject: [PATCH 148/468] Add pytest-asyncio to python 3.4 and 3.5 dev requirements --- requirements34-dev.txt | 1 + requirements35-dev.txt | 1 + 2 files changed, 2 insertions(+) create mode 100644 requirements34-dev.txt create mode 100644 requirements35-dev.txt diff --git a/requirements34-dev.txt b/requirements34-dev.txt new file mode 100644 index 00000000..2d73dba5 --- /dev/null +++ b/requirements34-dev.txt @@ -0,0 +1 @@ +pytest-asyncio diff --git a/requirements35-dev.txt b/requirements35-dev.txt new file mode 100644 index 00000000..2d73dba5 --- /dev/null +++ b/requirements35-dev.txt @@ -0,0 +1 @@ +pytest-asyncio From 1550bcc522f4f7d95b5556ee81fb688b5d97c644 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 1 Jul 2016 04:29:20 -0700 Subject: [PATCH 149/468] Move requests sessions initialization to the platform specific constructor --- pubnub/pubnub.py | 1 + pubnub/pubnub_core.py | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 22d540e0..e462802d 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -25,6 +25,7 @@ class PubNub(PubNubCore): def __init__(self, config): assert isinstance(config, PNConfiguration) + self.session = requests.Session() PubNubCore.__init__(self, config) if self.config.enable_subscribe: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index e8c204c4..6a547c3c 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -23,13 +23,12 @@ class PubNubCore: def __init__(self, config): self.config = config - self.session = requests.Session() - self.config.validate() self.headers = { 'User-Agent': self.sdk_name } + # TODO: move to platform-specific initializer self.publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) @abstractmethod From 5bec8b1e28cc492368cf7b455569aa1fabdfab6b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 1 Jul 2016 04:30:44 -0700 Subject: [PATCH 150/468] Add default value to utils.build_url :params param --- pubnub/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/utils.py b/pubnub/utils.py index 98727c5a..7b68408a 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -99,7 +99,7 @@ def extend_list(existing_items, new_items): existing_items.extend(new_items) -def build_url(scheme, origin, path, params): +def build_url(scheme, origin, path, params={}): return pn_urlunsplit((scheme, origin, path, params, '')) From 5d658ca18f566dbafa60e3e7895370bc22b1c463 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 1 Jul 2016 04:33:05 -0700 Subject: [PATCH 151/468] Add default ancrypted configuration for tests --- tests/helper.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/helper.py b/tests/helper.py index 1f0e7c7f..c5c4c885 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -38,6 +38,10 @@ def pnconf_copy(): return copy(pnconf) + +def pnconf_enc_copy(): + return copy(pnconf_enc) + sdk_name = "Python-UnitTest" From bf4bce9a55b6c4d2d3eed56a671a551289c36a59 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 1 Jul 2016 04:38:57 -0700 Subject: [PATCH 152/468] Add the basic asyncio platform class with publish tests --- pubnub/pubnub_asyncio.py | 407 ++++++++++++++++++ tests/integrational/asyncio/__init__.py | 0 tests/integrational/asyncio/test_publish.py | 146 +++++++ tests/integrational/asyncio/test_subscribe.py | 28 ++ tests/integrational/native/native_helper.py | 66 +++ 5 files changed, 647 insertions(+) create mode 100644 pubnub/pubnub_asyncio.py create mode 100644 tests/integrational/asyncio/__init__.py create mode 100644 tests/integrational/asyncio/test_publish.py create mode 100644 tests/integrational/asyncio/test_subscribe.py create mode 100644 tests/integrational/native/native_helper.py diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py new file mode 100644 index 00000000..f9888866 --- /dev/null +++ b/pubnub/pubnub_asyncio.py @@ -0,0 +1,407 @@ +import logging +import json +import asyncio +import aiohttp +import math + +from asyncio import Event, Queue, Semaphore + +from pubnub.builders import SubscribeBuilder, UnsubscribeBuilder +from pubnub.endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup +from pubnub.endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup +from pubnub.endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup +from pubnub.endpoints.channel_groups.remove_channel_group import RemoveChannelGroup +from pubnub.endpoints.presence.get_state import GetState +from pubnub.endpoints.presence.heartbeat import Heartbeat +from pubnub.endpoints.presence.leave import Leave +from pubnub.endpoints.presence.set_state import SetState +from pubnub.pubnub_core import PubNubCore +from .endpoints.pubsub.subscribe import Subscribe +from .workers import SubscribeMessageWorker +from .managers import SubscriptionManager +from . import utils +from .structures import ResponseInfo +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions +from .callbacks import SubscribeCallback +from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED +from .exceptions import PubNubException + +logger = logging.getLogger("pubnub") + + +class PubNubAsyncio(PubNubCore): + """ + PubNub Python SDK for asyncio framework + """ + + def __init__(self, config, custom_event_loop=None): + super(PubNubAsyncio, self).__init__(config) + self.event_loop = custom_event_loop or asyncio.get_event_loop() + self.session = aiohttp.ClientSession(loop=self.event_loop) + self._subscription_manager = None + + if self.config.enable_subscribe: + self._subscription_manager = AsyncioSubscriptionManager(self) + + def stop(self): + if self._subscription_manager is not None: + self._subscription_manager.stop() + + def sdk_platform(self): + return "-Asyncio" + + def add_listener(self, listener): + if self._subscription_manager is not None: + assert isinstance(listener, SubscribeCallback) + self._subscription_manager.add_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + + def heartbeat(self): + return Heartbeat(self) + + def subscribe(self): + return SubscribeBuilder(self._subscription_manager) + + def unsubscribe(self): + return UnsubscribeBuilder(self._subscription_manager) + + def set_state(self): + return SetState(self, self._subscription_manager) + + def get_state(self): + return GetState(self) + + def add_channel_to_channel_group(self): + return AddChannelToChannelGroup(self) + + def remove_channel_from_channel_group(self): + return RemoveChannelFromChannelGroup(self) + + def list_channels_in_channel_group(self): + return ListChannelsInChannelGroup(self) + + def remove_channel_group(self): + return RemoveChannelGroup(self) + + def request_sync(self, *args): + raise NotImplementedError + + def request_async(self, *args): + raise NotImplementedError + + def request_deferred(self, *args): + raise NotImplementedError + + async def request_future(self, intermediate_key_future, options_func, create_response, + create_status_response, cancellation_event): + if cancellation_event is not None: + assert isinstance(cancellation_event, Event) + + options = options_func() + + url = utils.build_url(self.config.scheme(), self.config.origin, + options.path) + logger.debug("%s %s %s" % (options.method_string, url, options.data)) + + if options.is_post(): + request_func = self.session.post + else: + request_func = self.session.get + + try: + response = await asyncio.wait_for( + request_func(url, + params=options.query_string, + headers=self.headers, + data=options.data if options.data is not None else None), + options.connect_timeout) + + except asyncio.TimeoutError: + print('error') + return + + try: + body = await asyncio.wait_for(response.text(), options.request_timeout) + except asyncio.TimeoutError: + print('error2') + return + + if cancellation_event is not None and cancellation_event.is_set(): + return + + response_info = None + status_category = PNStatusCategory.PNUnknownCategory + + if response is not None: + request_url = utils.urlparse(response.url) + query = utils.parse_qs(request_url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=response.status, + tls_enabled='https' == request_url.scheme, + origin=request_url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=None + ) + + if body is not None and len(body) > 0: + try: + data = json.loads(body) + except TypeError: + try: + data = json.loads(body.decode("utf-8")) + except ValueError: + raise PubNubAsyncioException( + result=create_response(None), + status=create_status_response(status_category, + response, + response_info, + PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error') + )) + else: + data = "N/A" + + logger.debug(data) + + if response.status != 200: + if response.status >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + if response.status == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if response.status == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if response.status == 599: + status_category = PNStatusCategory.PNTimeoutCategory + + raise PubNubAsyncioException( + result=data, + status=create_status_response(status_category, data, response_info, + PubNubException( + errormsg=data, + pn_error=err, + status_code=response.status + )) + ) + else: + return AsyncioEnvelope( + result=create_response(data), + status=create_status_response( + PNStatusCategory.PNAcknowledgmentCategory, + data, + response_info, + None) + ) + + +class AsyncioSubscriptionManager(SubscriptionManager): + def __init__(self, pubnub_instance): + self._message_queue = Queue() + self._consumer_event = Event() + self._subscription_lock = Semaphore(1) + self._current_request_key_object = None + self._heartbeat_periodic_callback = None + super(AsyncioSubscriptionManager, self).__init__(pubnub_instance) + + def _set_consumer_event(self): + self._consumer_event.set() + + def _message_queue_put(self, message): + self._message_queue.put(message) + + def _start_worker(self): + self._consumer = AsyncioSubscribeMessageWorker(self._pubnub, + self._listener_manager, + self._message_queue, + self._consumer_event) + asyncio.ensure_future(self._consumer.run(), loop=self._pubnub.event_loop) + + def reconnect(self): + self._should_stop = False + self._pubnub.event_loop.call_soon(self._start_subscribe_loop) + self._register_heartbeat_timer() + + async def _start_subscribe_loop(self): + self._stop_subscribe_loop() + await self._subscription_lock.acquire() + cancellation_event = Event() + + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) + + if len(combined_channels) == 0 and len(combined_groups) == 0: + return + + try: + self._subscribe_call = Subscribe(self._pubnub) \ + .channels(combined_channels).channel_groups(combined_groups) \ + .timetoken(self._timetoken).region(self._region) \ + .filter_expression(self._pubnub.config.filter_expression) \ + .cancellation_event(cancellation_event) \ + .future() + + envelope = await self.subscribe_call + + self._handle_endpoint_call(envelope.result, envelope.status) + except PubNubAsyncioException as e: + if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: + self._pubnub.event_loop.call_soon(self._start_subscribe_loop) + else: + self._listener_manager.announce_status(e.status) + finally: + cancellation_event.set() + self._subscription_lock.release() + + def _stop_subscribe_loop(self): + if self._subscribe_call is not None: + self._subscribe_call.cancel() + + def _stop_heartbeat_timer(self): + if self._heartbeat_periodic_callback is not None: + self._heartbeat_periodic_callback.stop() + + def _register_heartbeat_timer(self): + super(AsyncioSubscriptionManager, self)._register_heartbeat_timer() + + self._heartbeat_periodic_callback = AsyncioPeriodicCallback( + self._perform_heartbeat_loop, + self._pubnub.config.heartbeat_interval * + AsyncioSubscriptionManager.HEARTBEAT_INTERVAL_MULTIPLIER, + self._pubnub.ioloop) + self._heartbeat_periodic_callback.start() + + async def _perform_heartbeat_loop(self): + if self._heartbeat_call is not None: + # TODO: cancel call + pass + + cancellation_event = Event() + state_payload = self._subscription_state.state_payload() + presence_channels = self._subscription_state.prepare_channel_list(False) + presence_groups = self._subscription_state.prepare_channel_group_list(False) + + if len(presence_channels) == 0 and len(presence_groups) == 0: + return + + try: + envelope = await self._pubnub.heartbeat() \ + .channels(presence_channels) \ + .channel_groups(presence_groups) \ + .state(state_payload) \ + .cancellation_event(cancellation_event) \ + .future() + + heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options + if envelope.status.is_error: + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + self._listener_manager.announce_stateus(envelope.status) + else: + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + self._listener_manager.announce_stateus(envelope.status) + + except PubNubAsyncioException as e: + pass + # if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: + # self._start_subscribe_loop() + # else: + # self._listener_manager.announce_status(e.status) + finally: + cancellation_event.set() + + async def _send_leave(self, unsubscribe_operation): + envelope = await Leave(self._pubnub) \ + .channels(unsubscribe_operation.channels) \ + .channel_groups(unsubscribe_operation.channel_groups).future() + self._listener_manager.announce_status(envelope.status) + + +class AsyncioSubscribeMessageWorker(SubscribeMessageWorker): + async def run(self): + await self._take_message() + + async def _take_message(self): + while not self._event.is_set(): + try: + msg = await self._queue.get() + if msg is not None: + self._process_incoming_payload(msg) + self._queue.task_done() + except Exception as e: + # TODO: move to finally + self._event.set() + logger.warn("take message interrupted: %s" % str(e)) + + +class AsyncioPeriodicCallback(object): + def __init__(self, callback, callback_time, event_loop): + self._callback = callback + self._callback_time = callback_time + self._event_loop = event_loop + self._next_timeout = None + self._running = False + self._timeout = None + + def start(self): + self._running = True + self._next_timeout = self._event_loop.time() + self._schedule_next() + + def stop(self): + self._running = False + if self._timeout is not None: + self._timeout.cancel() + self._timeout = None + + def _run(self): + if not self._running: + return + try: + return self._callback() + except Exception: + # TODO: handle the exception + pass + # self.event_loop.call_exception_handler() + finally: + self._schedule_next() + + def _schedule_next(self): + current_time = self._event_loop.time() + + if self._next_timeout <= current_time: + callback_time_sec = self._callback_time / 1000.0 + self._next_timeout += (math.floor( + (current_time - self._next_timeout) / callback_time_sec) + 1) * callback_time_sec + + self._timeout = self._event_loop.call_later(self._next_timeout, self._run) + + +class AsyncioEnvelope(object): + def __init__(self, result, status): + self.result = result + self.status = status + + +class PubNubAsyncioException(Exception): + def __init__(self, result, status): + self.result = result + self.status = status + + def __str__(self): + return str(self.status.error_data.exception) diff --git a/tests/integrational/asyncio/__init__.py b/tests/integrational/asyncio/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py new file mode 100644 index 00000000..73b9ab61 --- /dev/null +++ b/tests/integrational/asyncio/test_publish.py @@ -0,0 +1,146 @@ +import logging + +import asyncio +import pytest +import pubnub as pn + +from pubnub.exceptions import PubNubException +from pubnub.models.consumer.common import PNStatus +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException +from tests.helper import pnconf_copy, pnconf_enc_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch = "asyncio-int-publish" + + +@pytest.mark.asyncio +async def assert_success_await(pub): + envelope = await pub.future() + + assert isinstance(envelope, AsyncioEnvelope) + assert isinstance(envelope.result, PNPublishResult) + assert isinstance(envelope.status, PNStatus) + assert envelope.result.timetoken > 0 + assert len(envelope.status.original_response) > 0 + + +@pytest.mark.asyncio +async def assert_client_side_error(pub, expected_err_msg): + try: + await pub.future() + except PubNubException as e: + assert expected_err_msg in str(e) + + +@pytest.mark.asyncio +async def assert_success_publish_get(pubnub, msg): + await assert_success_await(pubnub.publish().channel(ch).message(msg)) + + +@pytest.mark.asyncio +async def assert_success_publish_post(pubnub, msg): + await assert_success_await(pubnub.publish().channel(ch).message(msg).use_post(True)) + + +@pytest.mark.asyncio +async def test_publish_string_via_get(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + await asyncio.gather( + asyncio.ensure_future(assert_success_publish_get(pubnub, "hi")), + asyncio.ensure_future(assert_success_publish_get(pubnub, 5)), + asyncio.ensure_future(assert_success_publish_get(pubnub, True)), + asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"])), + asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))) + + +@pytest.mark.asyncio +async def test_publish_string_via_post(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + await asyncio.gather( + asyncio.ensure_future(assert_success_publish_post(pubnub, "hi")), + asyncio.ensure_future(assert_success_publish_post(pubnub, 5)), + asyncio.ensure_future(assert_success_publish_post(pubnub, True)), + asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"])), + asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))) + + +@pytest.mark.asyncio +async def test_publish_string_via_get_encrypted(event_loop): + pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) + await asyncio.gather( + asyncio.ensure_future(assert_success_publish_get(pubnub, "hi")), + asyncio.ensure_future(assert_success_publish_get(pubnub, 5)), + asyncio.ensure_future(assert_success_publish_get(pubnub, True)), + asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"])), + asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))) + + +@pytest.mark.asyncio +async def test_publish_string_via_post_encrypted(event_loop): + pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) + await asyncio.gather( + asyncio.ensure_future(assert_success_publish_post(pubnub, "hi")), + asyncio.ensure_future(assert_success_publish_post(pubnub, 5)), + asyncio.ensure_future(assert_success_publish_post(pubnub, True)), + asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"])), + asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))) + + +@pytest.mark.asyncio +async def test_error_missing_message(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + await assert_client_side_error(pubnub.publish().channel(ch).message(None), "Message missing") + + +@pytest.mark.asyncio +async def test_error_missing_channel(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + await assert_client_side_error(pubnub.publish().channel("").message("hey"), "Channel missing") + + +@pytest.mark.asyncio +async def test_error_non_serializable(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + + def method(): + pass + + await assert_client_side_error(pubnub.publish().channel(ch).message(method), "not JSON serializable") + + +@pytest.mark.asyncio +async def test_publish_with_meta(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + + await assert_success_await(pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + + +@pytest.mark.asyncio +async def test_publish_do_not_store(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + + await assert_success_await(pubnub.publish().channel(ch).message("hey").should_store(False)) + + +@pytest.mark.asyncio +async def assert_server_side_error_yield(pub, expected_err_msg): + try: + await pub.future() + except PubNubAsyncioException as e: + assert expected_err_msg in str(e) + + +@pytest.mark.asyncio +async def test_error_invalid_key(event_loop): + conf = PNConfiguration() + conf.publish_key = "fake" + conf.subscribe_key = "demo" + conf.enable_subscribe = False + + pubnub = PubNubAsyncio(conf, custom_event_loop=event_loop) + + await assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "Invalid Key") + diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py new file mode 100644 index 00000000..50465b0d --- /dev/null +++ b/tests/integrational/asyncio/test_subscribe.py @@ -0,0 +1,28 @@ +import logging +import asyncio +import pytest +import pubnub as pn +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests.helper import pnconf_copy +from tests.integrational.native.native_helper import SubscribeListener + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +@pytest.mark.asyncio +async def test_subscribe_async_await(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe() \ + .channels(["ch1", "ch2"]) \ + .execute() + + await callback.wait_for_connect() + # assert callback.done + # assert callback.msg.actual_channel == 'ch1' + # assert callback.msg.subscribed_channel == 'ch1' + # assert callback.msg.message == 'hey' + # assert callback.msg.timetoken > 0 + + # pubnub.stop() diff --git a/tests/integrational/native/native_helper.py b/tests/integrational/native/native_helper.py new file mode 100644 index 00000000..e8be8ffa --- /dev/null +++ b/tests/integrational/native/native_helper.py @@ -0,0 +1,66 @@ +import asyncio + +from asyncio import Event, Queue +from pubnub.callbacks import SubscribeCallback +from tests import helper + + +class SubscribeListener(SubscribeCallback): + def __init__(self): + self.connected = False + self.connected_event = Event() + self.disconnected_event = Event() + self.presence_queue = Queue() + self.message_queue = Queue() + + def status(self, pubnub, status): + if helper.is_subscribed_event(status) and not self.connected_event.is_set(): + self.connected_event.set() + elif helper.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): + self.disconnected_event.set() + + def message(self, pubnub, message): + self.message_queue.put(message) + + def presence(self, pubnub, presence): + self.presence_queue.put(presence) + + @asyncio.coroutine + def wait_for_connect(self): + if not self.connected_event.is_set(): + yield from self.connected_event.wait() + else: + raise Exception("instance is already connected") + + @asyncio.coroutine + def wait_for_disconnect(self): + if not self.disconnected_event.is_set(): + yield from self.disconnected_event.wait() + else: + raise Exception("instance is already disconnected") + + @asyncio.coroutine + def wait_for_message_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = yield from self.message_queue.get() + if env.actual_channel in channel_names: + raise gen.Return(env) + else: + continue + finally: + self.message_queue.task_done() + + @asyncio.coroutine + def wait_for_presence_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = yield from self.presence_queue.get() + if env.actual_channel[:-7] in channel_names: + raise gen.Return(env) + else: + continue + finally: + self.presence_queue.task_done() From a53ece04b90a3a9fc698a7eb2066937260a6f1f6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 2 Jul 2016 13:12:08 -0700 Subject: [PATCH 153/468] Add asyncio basic subscribe test --- pubnub/managers.py | 10 +- pubnub/pubnub_asyncio.py | 118 ++++++++++-------- pubnub/pubnub_tornado.py | 1 + tests/helper.py | 4 + tests/integrational/asyncio/test_subscribe.py | 22 ++-- 5 files changed, 85 insertions(+), 70 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index dc3f9a88..d2875b55 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -140,7 +140,7 @@ def __init__(self, pubnub_instance): self._should_stop = False - self._subscribe_call = None + self._subscribe_request_task = None self._heartbeat_call = None self._start_worker() @@ -180,7 +180,6 @@ def _send_leave(self, unsubscribe_operation): def add_listener(self, listener): self._listener_manager.add_listener(listener) - @synchronized def adapt_subscribe_builder(self, subscribe_operation): assert isinstance(subscribe_operation, SubscribeOperation) self._subscription_state.adapt_subscribe_builder(subscribe_operation) @@ -191,7 +190,6 @@ def adapt_subscribe_builder(self, subscribe_operation): self.reconnect() - @synchronized def adapt_unsubscribe_builder(self, unsubscribe_operation): assert isinstance(unsubscribe_operation, UnsubscribeOperation) @@ -204,17 +202,16 @@ def adapt_unsubscribe_builder(self, unsubscribe_operation): self._timetoken = 0 self.reconnect() - @synchronized def reconnect(self): self._should_stop = False self._start_subscribe_loop() self._register_heartbeat_timer() def stop(self): - # self._stop_heartbeat_timer() - self._stop_subscribe_loop() self._should_stop = True + self._stop_subscribe_loop() self._set_consumer_event() + self._stop_heartbeat_timer() def _handle_endpoint_call(self, raw_result, status): assert isinstance(status, PNStatus) @@ -243,7 +240,6 @@ def _handle_endpoint_call(self, raw_result, status): # REVIEW: is int compatible with long for Python 2 self._timetoken = int(result.metadata.timetoken) self._region = int(result.metadata.region) - self._start_subscribe_loop() # TODO: implement def _register_heartbeat_timer(self): diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index f9888866..60660215 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -5,18 +5,17 @@ import math from asyncio import Event, Queue, Semaphore - -from pubnub.builders import SubscribeBuilder, UnsubscribeBuilder -from pubnub.endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup -from pubnub.endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup -from pubnub.endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup -from pubnub.endpoints.channel_groups.remove_channel_group import RemoveChannelGroup -from pubnub.endpoints.presence.get_state import GetState -from pubnub.endpoints.presence.heartbeat import Heartbeat -from pubnub.endpoints.presence.leave import Leave -from pubnub.endpoints.presence.set_state import SetState -from pubnub.pubnub_core import PubNubCore +from .builders import SubscribeBuilder, UnsubscribeBuilder +from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup +from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup +from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup +from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup +from .endpoints.presence.get_state import GetState +from .endpoints.presence.heartbeat import Heartbeat +from .endpoints.presence.leave import Leave +from .endpoints.presence.set_state import SetState from .endpoints.pubsub.subscribe import Subscribe +from .pubnub_core import PubNubCore from .workers import SubscribeMessageWorker from .managers import SubscriptionManager from . import utils @@ -44,6 +43,7 @@ def __init__(self, config, custom_event_loop=None): self._subscription_manager = AsyncioSubscriptionManager(self) def stop(self): + self.session.close() if self._subscription_manager is not None: self._subscription_manager.stop() @@ -100,9 +100,10 @@ async def request_future(self, intermediate_key_future, options_func, create_res options = options_func() - url = utils.build_url(self.config.scheme(), self.config.origin, - options.path) - logger.debug("%s %s %s" % (options.method_string, url, options.data)) + url = utils.build_url(self.config.scheme(), self.config.origin, options.path) + log_url = utils.build_url(self.config.scheme(), self.config.origin, + options.path, options.query_string) + logger.debug("%s %s %s" % (options.method_string, log_url, options.data)) if options.is_post(): request_func = self.session.post @@ -116,7 +117,6 @@ async def request_future(self, intermediate_key_future, options_func, create_res headers=self.headers, data=options.data if options.data is not None else None), options.connect_timeout) - except asyncio.TimeoutError: print('error') return @@ -213,34 +213,39 @@ async def request_future(self, intermediate_key_future, options_func, create_res class AsyncioSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): self._message_queue = Queue() - self._consumer_event = Event() self._subscription_lock = Semaphore(1) - self._current_request_key_object = None + self._subscribe_loop_task = None self._heartbeat_periodic_callback = None super(AsyncioSubscriptionManager, self).__init__(pubnub_instance) def _set_consumer_event(self): - self._consumer_event.set() + if not self._message_worker.cancelled(): + self._message_worker.cancel() def _message_queue_put(self, message): self._message_queue.put(message) def _start_worker(self): - self._consumer = AsyncioSubscribeMessageWorker(self._pubnub, - self._listener_manager, - self._message_queue, - self._consumer_event) - asyncio.ensure_future(self._consumer.run(), loop=self._pubnub.event_loop) + consumer = AsyncioSubscribeMessageWorker(self._pubnub, + self._listener_manager, + self._message_queue, None) + self._message_worker = asyncio.ensure_future(consumer.run(), + loop=self._pubnub.event_loop) def reconnect(self): self._should_stop = False - self._pubnub.event_loop.call_soon(self._start_subscribe_loop) + self._subscribe_loop_task = asyncio.ensure_future(self._start_subscribe_loop()) self._register_heartbeat_timer() + def stop(self): + super(AsyncioSubscriptionManager, self).stop() + if self._subscribe_loop_task is not None and not self._subscribe_loop_task.cancelled(): + self._subscribe_loop_task.cancel() + async def _start_subscribe_loop(self): self._stop_subscribe_loop() + await self._subscription_lock.acquire() - cancellation_event = Event() combined_channels = self._subscription_state.prepare_channel_list(True) combined_groups = self._subscription_state.prepare_channel_group_list(True) @@ -249,28 +254,33 @@ async def _start_subscribe_loop(self): return try: - self._subscribe_call = Subscribe(self._pubnub) \ - .channels(combined_channels).channel_groups(combined_groups) \ - .timetoken(self._timetoken).region(self._region) \ - .filter_expression(self._pubnub.config.filter_expression) \ - .cancellation_event(cancellation_event) \ - .future() + self._subscribe_request_task = asyncio.ensure_future( + Subscribe(self._pubnub) + .channels(combined_channels) + .channel_groups(combined_groups) + .timetoken(self._timetoken).region(self._region) + .filter_expression(self._pubnub.config.filter_expression) + .future()) - envelope = await self.subscribe_call + envelope = await self._subscribe_request_task self._handle_endpoint_call(envelope.result, envelope.status) + self._subscribe_loop_task = asyncio.ensure_future(self._start_subscribe_loop()) except PubNubAsyncioException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: self._pubnub.event_loop.call_soon(self._start_subscribe_loop) else: self._listener_manager.announce_status(e.status) + except asyncio.CancelledError as e: + print('cancelled') + except Exception as e: + print(str(e)) finally: - cancellation_event.set() self._subscription_lock.release() def _stop_subscribe_loop(self): - if self._subscribe_call is not None: - self._subscribe_call.cancel() + if self._subscribe_request_task is not None and not self._subscribe_request_task.cancelled(): + self._subscribe_request_task.cancel() def _stop_heartbeat_timer(self): if self._heartbeat_periodic_callback is not None: @@ -281,10 +291,10 @@ def _register_heartbeat_timer(self): self._heartbeat_periodic_callback = AsyncioPeriodicCallback( self._perform_heartbeat_loop, - self._pubnub.config.heartbeat_interval * - AsyncioSubscriptionManager.HEARTBEAT_INTERVAL_MULTIPLIER, - self._pubnub.ioloop) - self._heartbeat_periodic_callback.start() + self._pubnub.config.heartbeat_interval * 1000, + self._pubnub.event_loop) + if not self._should_stop: + self._heartbeat_periodic_callback.start() async def _perform_heartbeat_loop(self): if self._heartbeat_call is not None: @@ -300,12 +310,14 @@ async def _perform_heartbeat_loop(self): return try: - envelope = await self._pubnub.heartbeat() \ - .channels(presence_channels) \ - .channel_groups(presence_groups) \ - .state(state_payload) \ - .cancellation_event(cancellation_event) \ - .future() + heartbeat_call = (Heartbeat(self._pubnub) + .channels(presence_channels) + .channel_groups(presence_groups) + .state(state_payload) + .cancellation_event(cancellation_event) + .future()) + + envelope = await heartbeat_call heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: @@ -325,10 +337,14 @@ async def _perform_heartbeat_loop(self): finally: cancellation_event.set() - async def _send_leave(self, unsubscribe_operation): + def _send_leave(self, unsubscribe_operation): + asyncio.ensure_future(self._send_leave_helper(unsubscribe_operation)) + + async def _send_leave_helper(self, unsubscribe_operation): envelope = await Leave(self._pubnub) \ .channels(unsubscribe_operation.channels) \ .channel_groups(unsubscribe_operation.channel_groups).future() + self._listener_manager.announce_status(envelope.status) @@ -337,7 +353,7 @@ async def run(self): await self._take_message() async def _take_message(self): - while not self._event.is_set(): + while True: try: msg = await self._queue.get() if msg is not None: @@ -345,8 +361,8 @@ async def _take_message(self): self._queue.task_done() except Exception as e: # TODO: move to finally - self._event.set() logger.warn("take message interrupted: %s" % str(e)) + break class AsyncioPeriodicCallback(object): @@ -373,11 +389,10 @@ def _run(self): if not self._running: return try: - return self._callback() + asyncio.ensure_future(self._callback()) except Exception: # TODO: handle the exception pass - # self.event_loop.call_exception_handler() finally: self._schedule_next() @@ -386,10 +401,11 @@ def _schedule_next(self): if self._next_timeout <= current_time: callback_time_sec = self._callback_time / 1000.0 + print("cb time", callback_time_sec) self._next_timeout += (math.floor( (current_time - self._next_timeout) / callback_time_sec) + 1) * callback_time_sec - self._timeout = self._event_loop.call_later(self._next_timeout, self._run) + self._timeout = self._event_loop.call_at(self._next_timeout, self._run) class AsyncioEnvelope(object): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 68e3029d..9223de9a 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -368,6 +368,7 @@ def _start_subscribe_loop(self): envelope = yield subscribe self._handle_endpoint_call(envelope.result, envelope.status) + self._start_subscribe_loop() except PubNubTornadoException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: self._pubnub.ioloop.add_callback(self._start_subscribe_loop) diff --git a/tests/helper.py b/tests/helper.py index c5c4c885..c8064cd9 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -39,6 +39,10 @@ def pnconf_copy(): return copy(pnconf) +def pnconf_sub_copy(): + return copy(pnconf_sub) + + def pnconf_enc_copy(): return copy(pnconf_enc) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 50465b0d..bb2aa3da 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -1,9 +1,8 @@ import logging -import asyncio import pytest import pubnub as pn from pubnub.pubnub_asyncio import PubNubAsyncio -from tests.helper import pnconf_copy +from tests.helper import pnconf_sub_copy from tests.integrational.native.native_helper import SubscribeListener pn.set_stream_logger('pubnub', logging.DEBUG) @@ -11,18 +10,17 @@ @pytest.mark.asyncio async def test_subscribe_async_await(event_loop): - pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + conf = pnconf_sub_copy() + conf.set_presence_timeout(14) + pubnub = PubNubAsyncio(conf, custom_event_loop=event_loop) + callback = SubscribeListener() pubnub.add_listener(callback) - pubnub.subscribe() \ - .channels(["ch1", "ch2"]) \ - .execute() + pubnub.subscribe().channels("ch1").execute() await callback.wait_for_connect() - # assert callback.done - # assert callback.msg.actual_channel == 'ch1' - # assert callback.msg.subscribed_channel == 'ch1' - # assert callback.msg.message == 'hey' - # assert callback.msg.timetoken > 0 - # pubnub.stop() + pubnub.unsubscribe().channels("ch1").execute() + await callback.wait_for_disconnect() + + pubnub.stop() From 652bde4acd9ab9648dbb84891bed7f9d33199427 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 4 Jul 2016 02:56:14 -0700 Subject: [PATCH 154/468] Add subscribe sub/pub/unsub test with associated fixes --- pubnub/managers.py | 1 - pubnub/pnconfiguration.py | 4 ++ pubnub/pubnub_asyncio.py | 44 ++++++++-------- tests/integrational/asyncio/test_subscribe.py | 50 +++++++++++++++++-- tests/integrational/native/native_helper.py | 26 ++++------ 5 files changed, 84 insertions(+), 41 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index d2875b55..4a1cda28 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -6,7 +6,6 @@ from .dtos import SubscribeOperation, UnsubscribeOperation from .callbacks import SubscribeCallback from .models.subscription_item import SubscriptionItem -from .utils import synchronized class PublishSequenceManager(object): diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 24047b58..1baab7fa 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -53,6 +53,10 @@ def set_presence_timeout_with_custom_interval(self, timeout, interval): def set_presence_timeout(self, timeout): self.set_presence_timeout_with_custom_interval(timeout, (timeout / 2) - 1) + @property + def port(self): + return 443 if self.ssl == "https" else 80 + @property def presence_timeout(self): return self._presence_timeout diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 60660215..c147bc98 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -36,14 +36,16 @@ class PubNubAsyncio(PubNubCore): def __init__(self, config, custom_event_loop=None): super(PubNubAsyncio, self).__init__(config) self.event_loop = custom_event_loop or asyncio.get_event_loop() - self.session = aiohttp.ClientSession(loop=self.event_loop) + # TODO: add proxies and option to reinitialize connector&session + self._connector = aiohttp.BaseConnector(conn_timeout=config.connect_timeout) + self._session = aiohttp.ClientSession(loop=self.event_loop) self._subscription_manager = None if self.config.enable_subscribe: self._subscription_manager = AsyncioSubscriptionManager(self) def stop(self): - self.session.close() + self._session.close() if self._subscription_manager is not None: self._subscription_manager.stop() @@ -105,27 +107,22 @@ async def request_future(self, intermediate_key_future, options_func, create_res options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, log_url, options.data)) - if options.is_post(): - request_func = self.session.post - else: - request_func = self.session.get - try: response = await asyncio.wait_for( - request_func(url, - params=options.query_string, - headers=self.headers, - data=options.data if options.data is not None else None), - options.connect_timeout) + self._session.request(options.method_string, url, + params=options.query_string, + headers=self.headers, + data=options.data if options.data is not None else None), + options.request_timeout) except asyncio.TimeoutError: - print('error') + raise + except asyncio.CancelledError: + raise + except Exception as e: + print('regular error', str(e)) return - try: - body = await asyncio.wait_for(response.text(), options.request_timeout) - except asyncio.TimeoutError: - print('error2') - return + body = await response.text() if cancellation_event is not None and cancellation_event.is_set(): return @@ -223,7 +220,7 @@ def _set_consumer_event(self): self._message_worker.cancel() def _message_queue_put(self, message): - self._message_queue.put(message) + self._message_queue.put_nowait(message) def _start_worker(self): consumer = AsyncioSubscribeMessageWorker(self._pubnub, @@ -264,6 +261,9 @@ async def _start_subscribe_loop(self): envelope = await self._subscribe_request_task + if self._subscribe_request_task.cancelled(): + return + self._handle_endpoint_call(envelope.result, envelope.status) self._subscribe_loop_task = asyncio.ensure_future(self._start_subscribe_loop()) except PubNubAsyncioException as e: @@ -274,7 +274,8 @@ async def _start_subscribe_loop(self): except asyncio.CancelledError as e: print('cancelled') except Exception as e: - print(str(e)) + print('error in subscribe loop:', str(e)) + raise e finally: self._subscription_lock.release() @@ -359,6 +360,9 @@ async def _take_message(self): if msg is not None: self._process_incoming_payload(msg) self._queue.task_done() + except asyncio.CancelledError: + logger.debug("Message Worker cancelled") + break except Exception as e: # TODO: move to finally logger.warn("take message interrupted: %s" % str(e)) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index bb2aa3da..260cf591 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -1,7 +1,10 @@ import logging + +import asyncio import pytest import pubnub as pn -from pubnub.pubnub_asyncio import PubNubAsyncio +from pubnub.models.consumer.pubsub import PNMessageResult +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope from tests.helper import pnconf_sub_copy from tests.integrational.native.native_helper import SubscribeListener @@ -9,10 +12,8 @@ @pytest.mark.asyncio -async def test_subscribe_async_await(event_loop): - conf = pnconf_sub_copy() - conf.set_presence_timeout(14) - pubnub = PubNubAsyncio(conf, custom_event_loop=event_loop) +async def test_subscribe_unsubscribe(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) callback = SubscribeListener() pubnub.add_listener(callback) @@ -24,3 +25,42 @@ async def test_subscribe_async_await(event_loop): await callback.wait_for_disconnect() pubnub.stop() + + +@pytest.mark.asyncio +async def test_subscribe_publish_unsubscribe(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + callback = SubscribeListener() + channel = "ch1" + message = "hey" + pubnub.add_listener(callback) + pubnub.subscribe().channels(channel).execute() + + await callback.wait_for_connect() + + publish_future = asyncio.ensure_future(pubnub.publish().channel(channel).message(message).future()) + subscribe_message_future = asyncio.ensure_future(callback.wait_for_message_on(channel)) + + await asyncio.wait([ + publish_future, + subscribe_message_future + ]) + + publish_envelope = publish_future.result() + subscribe_envelope = subscribe_message_future.result() + + assert isinstance(subscribe_envelope, PNMessageResult) + assert subscribe_envelope.actual_channel == channel + assert subscribe_envelope.subscribed_channel == channel + assert subscribe_envelope.message == message + assert subscribe_envelope.timetoken > 0 + + assert isinstance(publish_envelope, AsyncioEnvelope) + assert publish_envelope.result.timetoken > 0 + assert publish_envelope.status.original_response[0] == 1 + + pubnub.unsubscribe().channels(channel).execute() + await callback.wait_for_disconnect() + + pubnub.stop() diff --git a/tests/integrational/native/native_helper.py b/tests/integrational/native/native_helper.py index e8be8ffa..a1f2c5aa 100644 --- a/tests/integrational/native/native_helper.py +++ b/tests/integrational/native/native_helper.py @@ -20,46 +20,42 @@ def status(self, pubnub, status): self.disconnected_event.set() def message(self, pubnub, message): - self.message_queue.put(message) + self.message_queue.put_nowait(message) def presence(self, pubnub, presence): self.presence_queue.put(presence) - @asyncio.coroutine - def wait_for_connect(self): + async def wait_for_connect(self): if not self.connected_event.is_set(): - yield from self.connected_event.wait() + await self.connected_event.wait() else: raise Exception("instance is already connected") - @asyncio.coroutine - def wait_for_disconnect(self): + async def wait_for_disconnect(self): if not self.disconnected_event.is_set(): - yield from self.disconnected_event.wait() + await self.disconnected_event.wait() else: raise Exception("instance is already disconnected") - @asyncio.coroutine - def wait_for_message_on(self, *channel_names): + async def wait_for_message_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = yield from self.message_queue.get() + env = await self.message_queue.get() if env.actual_channel in channel_names: - raise gen.Return(env) + return env else: continue finally: self.message_queue.task_done() - @asyncio.coroutine - def wait_for_presence_on(self, *channel_names): + async def wait_for_presence_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = yield from self.presence_queue.get() + env = await self.presence_queue.get() if env.actual_channel[:-7] in channel_names: - raise gen.Return(env) + return env else: continue finally: From 4c085374fe2e9de3b41fb94511ee1144b0cb7634 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 4 Jul 2016 03:33:19 -0700 Subject: [PATCH 155/468] Add presence join/leave test for Asyncio --- tests/integrational/asyncio/test_subscribe.py | 48 +++++++++++++++++++ tests/integrational/native/native_helper.py | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 260cf591..3a7d515f 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -5,6 +5,7 @@ import pubnub as pn from pubnub.models.consumer.pubsub import PNMessageResult from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope +from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.native.native_helper import SubscribeListener @@ -64,3 +65,50 @@ async def test_subscribe_publish_unsubscribe(event_loop): await callback.wait_for_disconnect() pubnub.stop() + + +@pytest.mark.asyncio +async def test_join_leave(event_loop): + channel = "ch1" + message = "hey" + + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + pubnub.config.uuid = helper.gen_channel("messenger") + pubnub_listener.config.uuid = helper.gen_channel("listener") + + callback_presence = SubscribeListener() + callback_messages = SubscribeListener() + + pubnub_listener.add_listener(callback_presence) + pubnub_listener.subscribe().channels("ch1").with_presence().execute() + + await callback_presence.wait_for_connect() + + envelope = await callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'join' + assert envelope.uuid == pubnub_listener.uuid + + pubnub.add_listener(callback_messages) + pubnub.subscribe().channels("ch1").execute() + await callback_messages.wait_for_connect() + + envelope = await callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'join' + assert envelope.uuid == pubnub.uuid + + pubnub.unsubscribe().channels("ch1").execute() + await callback_messages.wait_for_disconnect() + + envelope = await callback_presence.wait_for_presence_on("ch1") + assert envelope.actual_channel == "ch1-pnpres" + assert envelope.event == 'leave' + assert envelope.uuid == pubnub.uuid + + pubnub_listener.unsubscribe().channels("ch1").execute() + await callback_presence.wait_for_disconnect() + + pubnub.stop() diff --git a/tests/integrational/native/native_helper.py b/tests/integrational/native/native_helper.py index a1f2c5aa..a7cb18c4 100644 --- a/tests/integrational/native/native_helper.py +++ b/tests/integrational/native/native_helper.py @@ -23,7 +23,7 @@ def message(self, pubnub, message): self.message_queue.put_nowait(message) def presence(self, pubnub, presence): - self.presence_queue.put(presence) + self.presence_queue.put_nowait(presence) async def wait_for_connect(self): if not self.connected_event.is_set(): From f5c799368dea41a7a84d657ad3602daf5797e5c8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 4 Jul 2016 05:53:14 -0700 Subject: [PATCH 156/468] Add Asyncio CG subscribe tests --- tests/integrational/asyncio/test_subscribe.py | 164 ++++++++++++++++-- tests/integrational/tornado/test_subscribe.py | 2 +- 2 files changed, 150 insertions(+), 16 deletions(-) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 3a7d515f..57348b3d 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -14,15 +14,17 @@ @pytest.mark.asyncio async def test_subscribe_unsubscribe(event_loop): + channel = helper.gen_channel("test-sub-unsub") + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) callback = SubscribeListener() pubnub.add_listener(callback) - pubnub.subscribe().channels("ch1").execute() + pubnub.subscribe().channels(channel).execute() await callback.wait_for_connect() - pubnub.unsubscribe().channels("ch1").execute() + pubnub.unsubscribe().channels(channel).execute() await callback.wait_for_disconnect() pubnub.stop() @@ -33,7 +35,7 @@ async def test_subscribe_publish_unsubscribe(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) callback = SubscribeListener() - channel = "ch1" + channel = helper.gen_channel("test-sub-pub-unsub") message = "hey" pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() @@ -69,8 +71,8 @@ async def test_subscribe_publish_unsubscribe(event_loop): @pytest.mark.asyncio async def test_join_leave(event_loop): - channel = "ch1" - message = "hey" + channel = helper.gen_channel("test-subscribe-join-leave") + presence_channel = "%s-pnpres" % channel pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -82,33 +84,165 @@ async def test_join_leave(event_loop): callback_messages = SubscribeListener() pubnub_listener.add_listener(callback_presence) - pubnub_listener.subscribe().channels("ch1").with_presence().execute() + pubnub_listener.subscribe().channels(channel).with_presence().execute() await callback_presence.wait_for_connect() - envelope = await callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" + envelope = await callback_presence.wait_for_presence_on(channel) + assert envelope.actual_channel == presence_channel assert envelope.event == 'join' assert envelope.uuid == pubnub_listener.uuid pubnub.add_listener(callback_messages) - pubnub.subscribe().channels("ch1").execute() + pubnub.subscribe().channels(channel).execute() await callback_messages.wait_for_connect() - envelope = await callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" + envelope = await callback_presence.wait_for_presence_on(channel) + assert envelope.actual_channel == presence_channel assert envelope.event == 'join' assert envelope.uuid == pubnub.uuid - pubnub.unsubscribe().channels("ch1").execute() + pubnub.unsubscribe().channels(channel).execute() await callback_messages.wait_for_disconnect() - envelope = await callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" + envelope = await callback_presence.wait_for_presence_on(channel) + assert envelope.actual_channel == presence_channel assert envelope.event == 'leave' assert envelope.uuid == pubnub.uuid - pubnub_listener.unsubscribe().channels("ch1").execute() + pubnub_listener.unsubscribe().channels(channel).execute() await callback_presence.wait_for_disconnect() pubnub.stop() + pubnub_listener.stop() + + +@pytest.mark.asyncio +async def test_cg_subscribe_unsubscribe(event_loop): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") + + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + envelope = await pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + await asyncio.sleep(1) + + callback_messages = SubscribeListener() + pubnub.add_listener(callback_messages) + pubnub.subscribe().channel_groups(gr).execute() + await callback_messages.wait_for_connect() + + pubnub.unsubscribe().channel_groups(gr).execute() + await callback_messages.wait_for_disconnect() + + envelope = await pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_cg_subscribe_publish_unsubscribe(event_loop): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") + message = "hey" + + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + envelope = await pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + await asyncio.sleep(1) + + callback_messages = SubscribeListener() + pubnub.add_listener(callback_messages) + pubnub.subscribe().channel_groups(gr).execute() + await callback_messages.wait_for_connect() + + subscribe_future = asyncio.ensure_future(callback_messages.wait_for_message_on(ch)) + publish_future = asyncio.ensure_future(pubnub.publish().channel(ch).message(message).future()) + await asyncio.wait([subscribe_future, publish_future]) + + sub_envelope = subscribe_future.result() + pub_envelope = publish_future.result() + + assert pub_envelope.status.original_response[0] == 1 + assert pub_envelope.status.original_response[1] == 'Sent' + + assert sub_envelope.actual_channel == ch + assert sub_envelope.subscribed_channel == gr + assert sub_envelope.message == message + + pubnub.unsubscribe().channel_groups(gr).execute() + await callback_messages.wait_for_disconnect() + + envelope = await pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_cg_join_leave(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + pubnub.config.uuid = helper.gen_channel("messenger") + pubnub_listener.config.uuid = helper.gen_channel("listener") + + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") + + envelope = await pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + await asyncio.sleep(1) + + callback_messages = SubscribeListener() + callback_presence = SubscribeListener() + + pubnub_listener.add_listener(callback_presence) + pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() + await callback_presence.wait_for_connect() + + prs_envelope = await callback_presence.wait_for_presence_on(ch) + assert prs_envelope.event == 'join' + assert prs_envelope.uuid == pubnub_listener.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + pubnub.add_listener(callback_messages) + pubnub.subscribe().channel_groups(gr).execute() + + callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_connect()) + presence_messages_future= asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) + await asyncio.wait([callback_messages_future, presence_messages_future]) + prs_envelope = presence_messages_future.result() + + assert prs_envelope.event == 'join' + assert prs_envelope.uuid == pubnub.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + pubnub.unsubscribe().channel_groups(gr).execute() + + callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_disconnect()) + presence_messages_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) + await asyncio.wait([callback_messages_future, presence_messages_future]) + prs_envelope = presence_messages_future.result() + + assert prs_envelope.event == 'leave' + assert prs_envelope.uuid == pubnub.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + pubnub_listener.unsubscribe().channel_groups(gr).execute() + await callback_presence.wait_for_disconnect() + + envelope = await pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + pubnub.stop() + pubnub_listener.stop() diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 61036904..ec29e37d 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -109,7 +109,7 @@ def setUp(self): @tornado.testing.gen_test(timeout=30) def test_subscribe_unsubscribe(self): ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscirbe-group") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 From deb8c2a273b003611f6ed0c513e5aa73f5a6300e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 01:14:12 -0700 Subject: [PATCH 157/468] Move Asyncio SubscribeListener to platform-specific file --- pubnub/pubnub_asyncio.py | 57 +++++++++++++++++ pubnub/utils.py | 14 +++++ tests/helper.py | 13 ---- tests/integrational/asyncio/test_subscribe.py | 3 +- tests/integrational/native/native_helper.py | 62 ------------------- 5 files changed, 72 insertions(+), 77 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index c147bc98..2d296b67 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -425,3 +425,60 @@ def __init__(self, result, status): def __str__(self): return str(self.status.error_data.exception) + + +class SubscribeListener(SubscribeCallback): + def __init__(self): + self.connected = False + self.connected_event = Event() + self.disconnected_event = Event() + self.presence_queue = Queue() + self.message_queue = Queue() + + def status(self, pubnub, status): + if utils.is_subscribed_event(status) and not self.connected_event.is_set(): + self.connected_event.set() + elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): + self.disconnected_event.set() + + def message(self, pubnub, message): + self.message_queue.put_nowait(message) + + def presence(self, pubnub, presence): + self.presence_queue.put_nowait(presence) + + async def wait_for_connect(self): + if not self.connected_event.is_set(): + await self.connected_event.wait() + else: + raise Exception("instance is already connected") + + async def wait_for_disconnect(self): + if not self.disconnected_event.is_set(): + await self.disconnected_event.wait() + else: + raise Exception("instance is already disconnected") + + async def wait_for_message_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = await self.message_queue.get() + if env.actual_channel in channel_names: + return env + else: + continue + finally: + self.message_queue.task_done() + + async def wait_for_presence_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = await self.presence_queue.get() + if env.actual_channel[:-7] in channel_names: + return env + else: + continue + finally: + self.presence_queue.task_done() diff --git a/pubnub/utils.py b/pubnub/utils.py index 7b68408a..8eca59ea 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -4,6 +4,8 @@ import six +from .enums import PNStatusCategory, PNOperationType +from .models.consumer.common import PNStatus from .errors import PNERR_JSON_NOT_SERIALIZABLE from .exceptions import PubNubException @@ -112,5 +114,17 @@ def synced_func(*args, **kws): return synced_func + +def is_subscribed_event(status): + assert isinstance(status, PNStatus) + return status.category == PNStatusCategory.PNConnectedCategory + + +def is_unsubscribed_event(status): + assert isinstance(status, PNStatus) + return status.category == PNStatusCategory.PNAcknowledgmentCategory \ + and status.operation == PNOperationType.PNUnsubscribeOperation + + urlparse = pn_urlparse parse_qs = pn_parse_qs diff --git a/tests/helper.py b/tests/helper.py index c8064cd9..debc78f8 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -6,8 +6,6 @@ from copy import copy from pubnub import utils -from pubnub.enums import PNOperationType, PNStatusCategory -from pubnub.models.consumer.common import PNStatus from pubnub.pnconfiguration import PNConfiguration @@ -61,17 +59,6 @@ def gen_string(l): return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(l)) -def is_subscribed_event(status): - assert isinstance(status, PNStatus) - return status.category == PNStatusCategory.PNConnectedCategory - - -def is_unsubscribed_event(status): - assert isinstance(status, PNStatus) - return status.category == PNStatusCategory.PNAcknowledgmentCategory \ - and status.operation == PNOperationType.PNUnsubscribeOperation - - class CountDownLatch(object): def __init__(self, count=1): self.count = count diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 57348b3d..07a789e4 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -4,10 +4,9 @@ import pytest import pubnub as pn from pubnub.models.consumer.pubsub import PNMessageResult -from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener from tests import helper from tests.helper import pnconf_sub_copy -from tests.integrational.native.native_helper import SubscribeListener pn.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native/native_helper.py b/tests/integrational/native/native_helper.py index a7cb18c4..e69de29b 100644 --- a/tests/integrational/native/native_helper.py +++ b/tests/integrational/native/native_helper.py @@ -1,62 +0,0 @@ -import asyncio - -from asyncio import Event, Queue -from pubnub.callbacks import SubscribeCallback -from tests import helper - - -class SubscribeListener(SubscribeCallback): - def __init__(self): - self.connected = False - self.connected_event = Event() - self.disconnected_event = Event() - self.presence_queue = Queue() - self.message_queue = Queue() - - def status(self, pubnub, status): - if helper.is_subscribed_event(status) and not self.connected_event.is_set(): - self.connected_event.set() - elif helper.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): - self.disconnected_event.set() - - def message(self, pubnub, message): - self.message_queue.put_nowait(message) - - def presence(self, pubnub, presence): - self.presence_queue.put_nowait(presence) - - async def wait_for_connect(self): - if not self.connected_event.is_set(): - await self.connected_event.wait() - else: - raise Exception("instance is already connected") - - async def wait_for_disconnect(self): - if not self.disconnected_event.is_set(): - await self.disconnected_event.wait() - else: - raise Exception("instance is already disconnected") - - async def wait_for_message_on(self, *channel_names): - channel_names = list(channel_names) - while True: - try: - env = await self.message_queue.get() - if env.actual_channel in channel_names: - return env - else: - continue - finally: - self.message_queue.task_done() - - async def wait_for_presence_on(self, *channel_names): - channel_names = list(channel_names) - while True: - try: - env = await self.presence_queue.get() - if env.actual_channel[:-7] in channel_names: - return env - else: - continue - finally: - self.presence_queue.task_done() From 330c2fb53e6fa9b460b11572cae37607f69eb098 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 02:26:07 -0700 Subject: [PATCH 158/468] Add Asyncio hb test --- tests/integrational/asyncio/test_heartbeat.py | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 tests/integrational/asyncio/test_heartbeat.py diff --git a/tests/integrational/asyncio/test_heartbeat.py b/tests/integrational/asyncio/test_heartbeat.py new file mode 100644 index 00000000..35f3f903 --- /dev/null +++ b/tests/integrational/asyncio/test_heartbeat.py @@ -0,0 +1,79 @@ +import logging +import asyncio +import pytest + +import pubnub as pn +from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +messenger_config = pnconf_sub_copy() +messenger_config.set_presence_timeout(8) +messenger_config.uuid = helper.gen_channel("messenger") + +listener_config = pnconf_sub_copy() +listener_config.uuid = helper.gen_channel("listener") + + +@pytest.mark.asyncio +async def test_timeout_event_on_broken_heartbeat(event_loop): + ch = helper.gen_channel("heartbeat-test") + + pubnub = PubNubAsyncio(messenger_config, custom_event_loop=event_loop) + pubnub_listener = PubNubAsyncio(listener_config, custom_event_loop=event_loop) + + pubnub.config.uuid = helper.gen_channel("messenger") + pubnub_listener.config.uuid = helper.gen_channel("listener") + + # - connect to :ch-pnpres + callback_presence = SubscribeListener() + pubnub_listener.add_listener(callback_presence) + pubnub_listener.subscribe().channels(ch).with_presence().execute() + await callback_presence.wait_for_connect() + + envelope = await callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == envelope.actual_channel + assert 'join' == envelope.event + assert pubnub_listener.uuid == envelope.uuid + + # - connect to :ch + callback_messages = SubscribeListener() + pubnub.add_listener(callback_messages) + pubnub.subscribe().channels(ch).execute() + + useless_connect_future = callback_messages.wait_for_connect() + presence_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) + + # - assert join event + await asyncio.wait([useless_connect_future, presence_future]) + + prs_envelope = presence_future.result() + + assert ch + "-pnpres" == prs_envelope.actual_channel + assert 'join' == prs_envelope.event + assert pubnub.uuid == prs_envelope.uuid + + # wait for one heartbeat call + await asyncio.sleep(8) + + # - break messenger heartbeat loop + pubnub._subscription_manager._stop_heartbeat_timer() + + # - assert for timeout + envelope = await callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == envelope.actual_channel + assert 'timeout' == envelope.event + assert pubnub.uuid == envelope.uuid + + pubnub.unsubscribe().channels(ch).execute() + await callback_messages.wait_for_disconnect() + + # - disconnect from :ch-pnpres + pubnub_listener.unsubscribe().channels(ch).execute() + await callback_presence.wait_for_disconnect() + + pubnub.stop() + pubnub_listener.stop() From b3807755b31cb8485103b011c2588d1cc6e64292 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 03:07:45 -0700 Subject: [PATCH 159/468] Move Tornado SubscribeListener to the platform-specific file --- pubnub/pubnub_tornado.py | 62 +++++++++++++++++++ tests/integrational/tornado/test_heartbeat.py | 10 +-- tests/integrational/tornado/test_subscribe.py | 22 +++---- tests/integrational/tornado/tornado_helper.py | 61 ------------------ 4 files changed, 74 insertions(+), 81 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 9223de9a..9fb07a91 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -16,6 +16,7 @@ from tornado.queues import Queue from tornado.simple_httpclient import SimpleAsyncHTTPClient +from pubnub.callbacks import SubscribeCallback from . import utils from .builders import SubscribeBuilder, UnsubscribeBuilder from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup @@ -456,3 +457,64 @@ def __init__(self, result, status): def __str__(self): return str(self.status.error_data.exception) + + +class SubscribeListener(SubscribeCallback): + def __init__(self): + self.connected = False + self.connected_event = Event() + self.disconnected_event = Event() + self.presence_queue = Queue() + self.message_queue = Queue() + + def status(self, pubnub, status): + if utils.is_subscribed_event(status) and not self.connected_event.is_set(): + self.connected_event.set() + elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): + self.disconnected_event.set() + + def message(self, pubnub, message): + self.message_queue.put(message) + + def presence(self, pubnub, presence): + self.presence_queue.put(presence) + + @tornado.gen.coroutine + def wait_for_connect(self): + if not self.connected_event.is_set(): + yield self.connected_event.wait() + else: + raise Exception("instance is already connected") + + @tornado.gen.coroutine + def wait_for_disconnect(self): + if not self.disconnected_event.is_set(): + yield self.disconnected_event.wait() + else: + raise Exception("instance is already disconnected") + + @tornado.gen.coroutine + def wait_for_message_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = yield self.message_queue.get() + if env.actual_channel in channel_names: + raise tornado.gen.Return(env) + else: + continue + finally: + self.message_queue.task_done() + + @tornado.gen.coroutine + def wait_for_presence_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = yield self.presence_queue.get() + if env.actual_channel[:-7] in channel_names: + raise tornado.gen.Return(env) + else: + continue + finally: + self.presence_queue.task_done() diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py index 4e8d4f5c..3cc51b36 100644 --- a/tests/integrational/tornado/test_heartbeat.py +++ b/tests/integrational/tornado/test_heartbeat.py @@ -4,16 +4,12 @@ from tornado.testing import AsyncTestCase from tornado import gen -from pubnub.pubnub_tornado import PubNubTornado +from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests import helper from tests.helper import pnconf_copy -from tests.integrational.tornado.tornado_helper import ExtendedSubscribeCallback pn.set_stream_logger('pubnub', logging.DEBUG) -ch1 = "ch1" -ch2 = "ch2" - class SubscriptionTest(object): def __init__(self): @@ -43,7 +39,7 @@ def test_timeout_event_on_broken_heartbeat(self): ch = helper.gen_channel("heartbeat-test") # - connect to :ch-pnpres - callback_presence = ExtendedSubscribeCallback() + callback_presence = SubscribeListener() self.pubnub_listener.add_listener(callback_presence) self.pubnub_listener.subscribe().channels(ch).with_presence().execute() yield callback_presence.wait_for_connect() @@ -54,7 +50,7 @@ def test_timeout_event_on_broken_heartbeat(self): assert self.pubnub_listener.uuid == envelope.uuid # - connect to :ch - callback_messages = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channels(ch).execute() diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index ec29e37d..84c9395f 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -4,16 +4,12 @@ from tornado.testing import AsyncTestCase from tornado import gen -from pubnub.pubnub_tornado import PubNubTornado +from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests import helper from tests.helper import pnconf_copy -from tests.integrational.tornado.tornado_helper import ExtendedSubscribeCallback pn.set_stream_logger('pubnub', logging.DEBUG) -ch1 = "ch1" -ch2 = "ch2" - class SubscriptionTest(object): def __init__(self): @@ -30,7 +26,7 @@ def setUp(self): @tornado.testing.gen_test() def test_subscribe_unsubscribe(self): - callback_messages = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channels("ch1").execute() yield callback_messages.wait_for_connect() @@ -43,7 +39,7 @@ def test_subscribe_publish_unsubscribe(self): ch = helper.gen_channel("subscribe-test") message = "hey" - callback_messages = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channels(ch).execute() yield callback_messages.wait_for_connect() @@ -66,7 +62,7 @@ def test_subscribe_publish_unsubscribe(self): def test_join_leave(self): self.pubnub.config.uuid = helper.gen_channel("messenger") self.pubnub_listener.config.uuid = helper.gen_channel("listener") - callback_presence = ExtendedSubscribeCallback() + callback_presence = SubscribeListener() self.pubnub_listener.add_listener(callback_presence) self.pubnub_listener.subscribe().channels("ch1").with_presence().execute() yield callback_presence.wait_for_connect() @@ -76,7 +72,7 @@ def test_join_leave(self): assert envelope.event == 'join' assert envelope.uuid == self.pubnub_listener.uuid - callback_messages = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channels("ch1").execute() yield callback_messages.wait_for_connect() @@ -116,7 +112,7 @@ def test_subscribe_unsubscribe(self): yield gen.sleep(1) - callback_messages = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channel_groups(gr).execute() yield callback_messages.wait_for_connect() @@ -138,7 +134,7 @@ def test_subscribe_publish_unsubscribe(self): yield gen.sleep(1) - callback_messages = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channel_groups(gr).execute() yield callback_messages.wait_for_connect() @@ -173,8 +169,8 @@ def test_join_leave(self): yield gen.sleep(1) - callback_messages = ExtendedSubscribeCallback() - callback_presence = ExtendedSubscribeCallback() + callback_messages = SubscribeListener() + callback_presence = SubscribeListener() self.pubnub_listener.add_listener(callback_presence) self.pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() diff --git a/tests/integrational/tornado/tornado_helper.py b/tests/integrational/tornado/tornado_helper.py index 2e98492d..3a56c522 100644 --- a/tests/integrational/tornado/tornado_helper.py +++ b/tests/integrational/tornado/tornado_helper.py @@ -22,67 +22,6 @@ def message(self, pubnub, message): pass -class ExtendedSubscribeCallback(SubscribeCallback): - def __init__(self): - self.connected = False - self.connected_event = Event() - self.disconnected_event = Event() - self.presence_queue = Queue() - self.message_queue = Queue() - - def status(self, pubnub, status): - if helper.is_subscribed_event(status) and not self.connected_event.is_set(): - self.connected_event.set() - elif helper.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): - self.disconnected_event.set() - - def message(self, pubnub, message): - self.message_queue.put(message) - - def presence(self, pubnub, presence): - self.presence_queue.put(presence) - - @gen.coroutine - def wait_for_connect(self): - if not self.connected_event.is_set(): - yield self.connected_event.wait() - else: - raise Exception("instance is already connected") - - @gen.coroutine - def wait_for_disconnect(self): - if not self.disconnected_event.is_set(): - yield self.disconnected_event.wait() - else: - raise Exception("instance is already disconnected") - - @gen.coroutine - def wait_for_message_on(self, *channel_names): - channel_names = list(channel_names) - while True: - try: - env = yield self.message_queue.get() - if env.actual_channel in channel_names: - raise gen.Return(env) - else: - continue - finally: - self.message_queue.task_done() - - @gen.coroutine - def wait_for_presence_on(self, *channel_names): - channel_names = list(channel_names) - while True: - try: - env = yield self.presence_queue.get() - if env.actual_channel[:-7] in channel_names: - raise gen.Return(env) - else: - continue - finally: - self.presence_queue.task_done() - - @gen.coroutine def connect_to_channel(pubnub, channel): event = Event() From 5ef697e463bf279149489c1e4b7e8a27dac0d281 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 03:48:00 -0700 Subject: [PATCH 160/468] Fix existing Tornado integrational tests --- tests/integrational/tornado/test_subscribe_cb.py | 7 ++++--- tests/integrational/tornado/tornado_helper.py | 7 +++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/integrational/tornado/test_subscribe_cb.py b/tests/integrational/tornado/test_subscribe_cb.py index f4116ff6..ac604b2d 100644 --- a/tests/integrational/tornado/test_subscribe_cb.py +++ b/tests/integrational/tornado/test_subscribe_cb.py @@ -1,10 +1,11 @@ import logging import pubnub as pn +import pubnub.utils as utils from tornado.testing import AsyncTestCase from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado -from tests import helper + from tests.helper import pnconf_copy pn.set_stream_logger('pubnub', logging.DEBUG) @@ -40,10 +41,10 @@ def status(self, pubnub, status): # connect event triggers only once, but probably should be triggered once for each channel # TODO collect 3 subscribe # TODO collect 3 unsubscribe - if helper.is_subscribed_event(status): + if utils.is_subscribed_event(status): self.subscribe = True _test.io_loop.add_callback(_test._publish) - elif helper.is_unsubscribed_event(status): + elif utils.is_unsubscribed_event(status): self.unsubscribe = True pubnub.stop() _test.stop() diff --git a/tests/integrational/tornado/tornado_helper.py b/tests/integrational/tornado/tornado_helper.py index 3a56c522..356bbdf3 100644 --- a/tests/integrational/tornado/tornado_helper.py +++ b/tests/integrational/tornado/tornado_helper.py @@ -1,9 +1,8 @@ from tornado.locks import Event from tornado import gen -from tornado.queues import Queue +from pubnub import utils from pubnub.callbacks import SubscribeCallback -from tests import helper class ConnectionEvent(SubscribeCallback): @@ -25,7 +24,7 @@ def message(self, pubnub, message): @gen.coroutine def connect_to_channel(pubnub, channel): event = Event() - callback = ConnectionEvent(event, helper.is_subscribed_event) + callback = ConnectionEvent(event, utils.is_subscribed_event) pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() yield event.wait() @@ -34,7 +33,7 @@ def connect_to_channel(pubnub, channel): @gen.coroutine def disconnect_from_channel(pubnub, channel): event = Event() - callback = ConnectionEvent(event, helper.is_unsubscribed_event) + callback = ConnectionEvent(event, utils.is_unsubscribed_event) pubnub.add_listener(callback) pubnub.unsubscribe().channels(channel).execute() yield event.wait() From 0936bdd6b81b39403de4c8aa7cb4801941664f6a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 04:17:57 -0700 Subject: [PATCH 161/468] Fix Tornado & Python 2.7 compatibility --- pubnub/pubnub_tornado.py | 2 +- tests/integrational/tornado/test_here_now.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 9fb07a91..46ba147a 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -16,8 +16,8 @@ from tornado.queues import Queue from tornado.simple_httpclient import SimpleAsyncHTTPClient -from pubnub.callbacks import SubscribeCallback from . import utils +from .callbacks import SubscribeCallback from .builders import SubscribeBuilder, UnsubscribeBuilder from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 8a172f52..4d9c9715 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -36,12 +36,12 @@ def test_single_channel(self): self.pubnub.stop() self.stop() - @tornado.testing.gen_test + @tornado.testing.gen_test(timeout=10) def test_multiple_channels(self): ch1 = helper.gen_channel("here-now") ch2 = helper.gen_channel("here-now") yield connect_to_channel(self.pubnub, [ch1, ch2]) - yield gen.sleep(2) + yield gen.sleep(4) env = yield self.pubnub.here_now() \ .channels([ch1, ch2]) \ .future() @@ -71,7 +71,7 @@ def test_global(self): env = yield self.pubnub.here_now().future() - assert env.result.total_channels > 2 + assert env.result.total_channels >= 2 assert env.result.total_occupancy >= 1 yield disconnect_from_channel(self.pubnub, [ch1, ch2]) From 023eec9f4d1c0e8f2f7b5838e2e3b0ffe27ce356 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 04:31:06 -0700 Subject: [PATCH 162/468] Rename file --- tests/integrational/tornado/{test_set_state.py => test_state.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/integrational/tornado/{test_set_state.py => test_state.py} (100%) diff --git a/tests/integrational/tornado/test_set_state.py b/tests/integrational/tornado/test_state.py similarity index 100% rename from tests/integrational/tornado/test_set_state.py rename to tests/integrational/tornado/test_state.py From 895dc208dc7d196dafcfe4c19a7ec0268eb90b15 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 06:38:35 -0700 Subject: [PATCH 163/468] Add Asyncio state tests --- tests/integrational/asyncio/test_state.py | 56 +++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 tests/integrational/asyncio/test_state.py diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py new file mode 100644 index 00000000..ac205a2a --- /dev/null +++ b/tests/integrational/asyncio/test_state.py @@ -0,0 +1,56 @@ +import pytest + +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests import helper +from tests.helper import pnconf + + +@pytest.mark.asyncio +async def test_single_channel(event_loop): + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + ch = helper.gen_channel("herenow-unit") + state = {"name": "Alex", "count": 5} + + env = await pubnub.set_state() \ + .channels(ch) \ + .state(state) \ + .future() + + assert env.result.state['name'] == "Alex" + assert env.result.state['count'] == 5 + + env = await pubnub.get_state() \ + .channels(ch) \ + .future() + + assert env.result.channels[ch]['name'] == "Alex" + assert env.result.channels[ch]['count'] == 5 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channels(event_loop): + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + state = {"name": "Alex", "count": 5} + + env = await pubnub.set_state() \ + .channels([ch1, ch2]) \ + .state(state) \ + .future() + + assert env.result.state['name'] == "Alex" + assert env.result.state['count'] == 5 + + env = await pubnub.get_state() \ + .channels([ch1, ch2]) \ + .future() + + assert env.result.channels[ch1]['name'] == "Alex" + assert env.result.channels[ch2]['name'] == "Alex" + assert env.result.channels[ch1]['count'] == 5 + assert env.result.channels[ch2]['count'] == 5 + + pubnub.stop() From e2dcc3b65044b019d0fae267bd898d94eea11e9f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 06:45:37 -0700 Subject: [PATCH 164/468] Add Asyncio CG CRUD tests --- .../asyncio/test_channel_groups.py | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 tests/integrational/asyncio/test_channel_groups.py diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py new file mode 100644 index 00000000..21a7b63d --- /dev/null +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -0,0 +1,120 @@ +import asyncio +import pytest + +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ + PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests import helper +from tests.helper import pnconf + + +@pytest.mark.asyncio +async def test_add_remove_single_channel(event_loop): + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + + # add + env = await pubnub.add_channel_to_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + await asyncio.sleep(1) + + # list + env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 1 + assert env.result.channels[0] == ch + + # remove + env = await pubnub.remove_channel_from_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) + + await asyncio.sleep(1) + + # list + env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 0 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_add_remove_multiple_channels(event_loop): + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + + # add + env = await pubnub.add_channel_to_channel_group() \ + .channels([ch1, ch2]).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + await asyncio.sleep(1) + + # list + env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 2 + assert ch1 in env.result.channels + assert ch2 in env.result.channels + + # remove + env = await pubnub.remove_channel_from_channel_group() \ + .channels([ch1, ch2]).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) + + await asyncio.sleep(1) + + # list + env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 0 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_add_channel_remove_group(event_loop): + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + + # add + env = await pubnub.add_channel_to_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + await asyncio.sleep(1) + + # list + env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 1 + assert env.result.channels[0] == ch + + # remove group + env = await pubnub.remove_channel_group().channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsRemoveGroupResult) + + await asyncio.sleep(1) + + # list + env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + assert len(env.result.channels) == 0 + + pubnub.stop() From 0322502f74e5c2fa3afb19b866e212f2388ab140 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 07:23:57 -0700 Subject: [PATCH 165/468] Add Asyncio HereNow integrational tests --- tests/integrational/asyncio/test_here_now.py | 100 +++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 tests/integrational/asyncio/test_here_now.py diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py new file mode 100644 index 00000000..004cf754 --- /dev/null +++ b/tests/integrational/asyncio/test_here_now.py @@ -0,0 +1,100 @@ +import asyncio +import pytest + +from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + + +@pytest.mark.asyncio +async def test_single_channel(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + ch = helper.gen_channel("herenow-unit") + + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe().channels(ch).execute() + + await callback.wait_for_connect() + + await asyncio.sleep(2) + + env = await pubnub.here_now() \ + .channels(ch) \ + .include_uuids(True) \ + .future() + + assert env.result.total_channels == 1 + assert env.result.total_occupancy >= 1 + + channels = env.result.channels + + assert len(channels) == 1 + assert channels[0].occupancy == 1 + assert channels[0].occupants[0].uuid == pubnub.uuid + + pubnub.unsubscribe().channels(ch).execute() + await callback.wait_for_disconnect() + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channels(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + ch1 = helper.gen_channel("here-now") + ch2 = helper.gen_channel("here-now") + + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe().channels([ch1, ch2]).execute() + + await callback.wait_for_connect() + + await asyncio.sleep(4) + env = await pubnub.here_now() \ + .channels([ch1, ch2]) \ + .future() + + assert env.result.total_channels == 2 + assert env.result.total_occupancy >= 1 + + channels = env.result.channels + + assert len(channels) == 2 + assert channels[0].occupancy == 1 + assert channels[0].occupants[0].uuid == pubnub.uuid + assert channels[1].occupancy == 1 + assert channels[1].occupants[0].uuid == pubnub.uuid + + pubnub.unsubscribe().channels([ch1, ch2]).execute() + await callback.wait_for_disconnect() + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_global(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + ch1 = helper.gen_channel("here-now") + ch2 = helper.gen_channel("here-now") + + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe().channels([ch1, ch2]).execute() + + await callback.wait_for_connect() + + await asyncio.sleep(2) + + env = await pubnub.here_now().future() + + assert env.result.total_channels >= 2 + assert env.result.total_occupancy >= 1 + + pubnub.unsubscribe().channels([ch1, ch2]).execute() + await callback.wait_for_disconnect() + + pubnub.stop() From 5f4583dedd597bdb81f2065fce4e8525a86d7fb4 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 07:44:40 -0700 Subject: [PATCH 166/468] Add dynamic channel names to Tornado subscription tests --- tests/integrational/tornado/test_subscribe.py | 29 +++++++++++-------- .../tornado/test_subscribe_cb.py | 3 -- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 84c9395f..e6a22556 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -26,12 +26,14 @@ def setUp(self): @tornado.testing.gen_test() def test_subscribe_unsubscribe(self): + ch = helper.gen_channel("subscribe-test") + callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) - self.pubnub.subscribe().channels("ch1").execute() + self.pubnub.subscribe().channels(ch).execute() yield callback_messages.wait_for_connect() - self.pubnub.unsubscribe().channels("ch1").execute() + self.pubnub.unsubscribe().channels(ch).execute() yield callback_messages.wait_for_disconnect() @tornado.testing.gen_test(timeout=30) @@ -55,11 +57,14 @@ def test_subscribe_publish_unsubscribe(self): assert sub_env.subscribed_channel == ch assert sub_env.message == message - self.pubnub.unsubscribe().channels("ch1").execute() + self.pubnub.unsubscribe().channels(ch).execute() yield callback_messages.wait_for_disconnect() @tornado.testing.gen_test() def test_join_leave(self): + ch = helper.gen_channel("subscribe-test") + ch_pnpres = ch + "-pnpres" + self.pubnub.config.uuid = helper.gen_channel("messenger") self.pubnub_listener.config.uuid = helper.gen_channel("listener") callback_presence = SubscribeListener() @@ -67,30 +72,30 @@ def test_join_leave(self): self.pubnub_listener.subscribe().channels("ch1").with_presence().execute() yield callback_presence.wait_for_connect() - envelope = yield callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" + envelope = yield callback_presence.wait_for_presence_on(ch) + assert envelope.actual_channel == ch_pnpres assert envelope.event == 'join' assert envelope.uuid == self.pubnub_listener.uuid callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) - self.pubnub.subscribe().channels("ch1").execute() + self.pubnub.subscribe().channels(ch).execute() yield callback_messages.wait_for_connect() - envelope = yield callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" + envelope = yield callback_presence.wait_for_presence_on(ch) + assert envelope.actual_channel == ch_pnpres assert envelope.event == 'join' assert envelope.uuid == self.pubnub.uuid - self.pubnub.unsubscribe().channels("ch1").execute() + self.pubnub.unsubscribe().channels(ch).execute() yield callback_messages.wait_for_disconnect() - envelope = yield callback_presence.wait_for_presence_on("ch1") - assert envelope.actual_channel == "ch1-pnpres" + envelope = yield callback_presence.wait_for_presence_on(ch) + assert envelope.actual_channel == ch_pnpres assert envelope.event == 'leave' assert envelope.uuid == self.pubnub.uuid - self.pubnub_listener.unsubscribe().channels("ch1").execute() + self.pubnub_listener.unsubscribe().channels(ch).execute() yield callback_presence.wait_for_disconnect() self.pubnub.stop() self.stop() diff --git a/tests/integrational/tornado/test_subscribe_cb.py b/tests/integrational/tornado/test_subscribe_cb.py index ac604b2d..5ae7c97c 100644 --- a/tests/integrational/tornado/test_subscribe_cb.py +++ b/tests/integrational/tornado/test_subscribe_cb.py @@ -10,9 +10,6 @@ pn.set_stream_logger('pubnub', logging.DEBUG) -ch1 = "ch1" -ch2 = "ch2" - class SubscriptionTest(object): def __init__(self): From 62e00a676356172bca371651995413b09daef3bf Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 5 Jul 2016 08:52:25 -0700 Subject: [PATCH 167/468] Add optional subscribe manager in Tornado --- pubnub/pubnub_tornado.py | 4 +++- tests/integrational/tornado/test_heartbeat.py | 6 +++--- tests/integrational/tornado/test_here_now.py | 4 ++-- tests/integrational/tornado/test_subscribe.py | 15 +++++++++------ tests/integrational/tornado/test_subscribe_cb.py | 4 ++-- 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 46ba147a..0adce3e1 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -107,8 +107,10 @@ def sdk_platform(self): def __init__(self, config, custom_ioloop=None): super(PubNubTornado, self).__init__(config) self.ioloop = custom_ioloop or ioloop.IOLoop.instance() + self._subscription_manager = None - self._subscription_manager = TornadoSubscriptionManager(self) + if self.config.enable_subscribe: + self._subscription_manager = TornadoSubscriptionManager(self) # TODO: choose a correct client here http://www.tornadoweb.org/en/stable/httpclient.html # TODO: 1000? diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py index 3cc51b36..9c963d9a 100644 --- a/tests/integrational/tornado/test_heartbeat.py +++ b/tests/integrational/tornado/test_heartbeat.py @@ -6,7 +6,7 @@ from tornado import gen from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests import helper -from tests.helper import pnconf_copy +from tests.helper import pnconf_sub_copy pn.set_stream_logger('pubnub', logging.DEBUG) @@ -22,11 +22,11 @@ class TestChannelSubscription(AsyncTestCase, SubscriptionTest): def setUp(self): super(TestChannelSubscription, self).setUp() - messenger_config = pnconf_copy() + messenger_config = pnconf_sub_copy() messenger_config.set_presence_timeout(8) messenger_config.uuid = helper.gen_channel("messenger") - listener_config = pnconf_copy() + listener_config = pnconf_sub_copy() listener_config.uuid = helper.gen_channel("listener") self.pubnub = PubNubTornado(messenger_config, custom_ioloop=self.io_loop) diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 4d9c9715..cad30b1a 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -4,14 +4,14 @@ from pubnub.pubnub_tornado import PubNubTornado from tests import helper -from tests.helper import pnconf +from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel class TestPubNubAsyncHereNow(AsyncTestCase): def setUp(self): super(TestPubNubAsyncHereNow, self).setUp() - self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) @tornado.testing.gen_test def test_single_channel(self): diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index e6a22556..fa6e0594 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -6,7 +6,7 @@ from tornado import gen from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests import helper -from tests.helper import pnconf_copy +from tests.helper import pnconf_sub_copy pn.set_stream_logger('pubnub', logging.DEBUG) @@ -21,8 +21,8 @@ def __init__(self): class TestChannelSubscription(AsyncTestCase, SubscriptionTest): def setUp(self): super(TestChannelSubscription, self).setUp() - self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) - self.pubnub_listener = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) @tornado.testing.gen_test() def test_subscribe_unsubscribe(self): @@ -36,6 +36,9 @@ def test_subscribe_unsubscribe(self): self.pubnub.unsubscribe().channels(ch).execute() yield callback_messages.wait_for_disconnect() + self.pubnub.stop() + self.stop() + @tornado.testing.gen_test(timeout=30) def test_subscribe_publish_unsubscribe(self): ch = helper.gen_channel("subscribe-test") @@ -69,7 +72,7 @@ def test_join_leave(self): self.pubnub_listener.config.uuid = helper.gen_channel("listener") callback_presence = SubscribeListener() self.pubnub_listener.add_listener(callback_presence) - self.pubnub_listener.subscribe().channels("ch1").with_presence().execute() + self.pubnub_listener.subscribe().channels(ch).with_presence().execute() yield callback_presence.wait_for_connect() envelope = yield callback_presence.wait_for_presence_on(ch) @@ -104,8 +107,8 @@ def test_join_leave(self): class TestChannelGroupSubscription(AsyncTestCase, SubscriptionTest): def setUp(self): super(TestChannelGroupSubscription, self).setUp() - self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) - self.pubnub_listener = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) @tornado.testing.gen_test(timeout=30) def test_subscribe_unsubscribe(self): diff --git a/tests/integrational/tornado/test_subscribe_cb.py b/tests/integrational/tornado/test_subscribe_cb.py index 5ae7c97c..213cf1fc 100644 --- a/tests/integrational/tornado/test_subscribe_cb.py +++ b/tests/integrational/tornado/test_subscribe_cb.py @@ -6,7 +6,7 @@ from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado -from tests.helper import pnconf_copy +from tests.helper import pnconf_sub_copy pn.set_stream_logger('pubnub', logging.DEBUG) @@ -21,7 +21,7 @@ def __init__(self): class TestMultipleChannelSubscriptions(AsyncTestCase, SubscriptionTest): def setUp(self): super(TestMultipleChannelSubscriptions, self).setUp() - self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) def test_do(self): _test = self From fae12ebebca1bf6edf61486340e2ad8c15fddc08 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 00:58:47 -0700 Subject: [PATCH 168/468] Move methods to the core PubNubCore class --- pubnub/pubnub.py | 6 ++--- pubnub/pubnub_asyncio.py | 40 +++-------------------------- pubnub/pubnub_core.py | 55 ++++++++++++++++++++++++++++++++-------- pubnub/pubnub_tornado.py | 40 +++-------------------------- 4 files changed, 53 insertions(+), 88 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index e462802d..b15fb68d 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -5,8 +5,7 @@ from .endpoints.pubsub.subscribe import Subscribe from .workers import SubscribeMessageWorker from .pnconfiguration import PNConfiguration -from .builders import SubscribeBuilder -from .managers import SubscriptionManager +from .managers import SubscriptionManager, PublishSequenceManager from . import utils from .structures import RequestOptions, ResponseInfo from .enums import PNStatusCategory @@ -31,8 +30,7 @@ def __init__(self, config): if self.config.enable_subscribe: self._subscription_manager = NativeSubscriptionManager(self) - def subscribe(self): - return SubscribeBuilder(self._subscription_manager) + self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) def sdk_platform(self): return "" diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 2d296b67..76398420 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -5,19 +5,12 @@ import math from asyncio import Event, Queue, Semaphore -from .builders import SubscribeBuilder, UnsubscribeBuilder -from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup -from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup -from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup -from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup -from .endpoints.presence.get_state import GetState from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave -from .endpoints.presence.set_state import SetState from .endpoints.pubsub.subscribe import Subscribe from .pubnub_core import PubNubCore from .workers import SubscribeMessageWorker -from .managers import SubscriptionManager +from .managers import SubscriptionManager, PublishSequenceManager from . import utils from .structures import ResponseInfo from .enums import PNStatusCategory, PNHeartbeatNotificationOptions @@ -39,11 +32,13 @@ def __init__(self, config, custom_event_loop=None): # TODO: add proxies and option to reinitialize connector&session self._connector = aiohttp.BaseConnector(conn_timeout=config.connect_timeout) self._session = aiohttp.ClientSession(loop=self.event_loop) - self._subscription_manager = None if self.config.enable_subscribe: self._subscription_manager = AsyncioSubscriptionManager(self) + # TODO: replace with platform-specific manager + self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + def stop(self): self._session.close() if self._subscription_manager is not None: @@ -59,33 +54,6 @@ def add_listener(self, listener): else: raise Exception("Subscription manager is not enabled for this instance") - def heartbeat(self): - return Heartbeat(self) - - def subscribe(self): - return SubscribeBuilder(self._subscription_manager) - - def unsubscribe(self): - return UnsubscribeBuilder(self._subscription_manager) - - def set_state(self): - return SetState(self, self._subscription_manager) - - def get_state(self): - return GetState(self) - - def add_channel_to_channel_group(self): - return AddChannelToChannelGroup(self) - - def remove_channel_from_channel_group(self): - return RemoveChannelFromChannelGroup(self) - - def list_channels_in_channel_group(self): - return ListChannelsInChannelGroup(self) - - def remove_channel_group(self): - return RemoveChannelGroup(self) - def request_sync(self, *args): raise NotImplementedError diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 6a547c3c..0da9a27a 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,9 +1,15 @@ import logging from abc import ABCMeta, abstractmethod -import requests - -from .managers import PublishSequenceManager +from .builders import SubscribeBuilder +from .builders import UnsubscribeBuilder +from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup +from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup +from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup +from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup +from .endpoints.presence.get_state import GetState +from .endpoints.presence.heartbeat import Heartbeat +from .endpoints.presence.set_state import SetState from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow @@ -28,19 +34,13 @@ def __init__(self, config): 'User-Agent': self.sdk_name } - # TODO: move to platform-specific initializer - self.publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + self._subscription_manager = None + self._publish_sequence_manager = None @abstractmethod def request_deferred(self, options_func): pass - def here_now(self): - return HereNow(self) - - def publish(self): - return Publish(self, self.publish_sequence_manager) - @property def sdk_name(self): return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) @@ -51,3 +51,36 @@ def sdk_platform(self): pass @property def uuid(self): return self.config.uuid + + def add_channel_to_channel_group(self): + return AddChannelToChannelGroup(self) + + def remove_channel_from_channel_group(self): + return RemoveChannelFromChannelGroup(self) + + def list_channels_in_channel_group(self): + return ListChannelsInChannelGroup(self) + + def remove_channel_group(self): + return RemoveChannelGroup(self) + + def subscribe(self): + return SubscribeBuilder(self._subscription_manager) + + def unsubscribe(self): + return UnsubscribeBuilder(self._subscription_manager) + + def heartbeat(self): + return Heartbeat(self) + + def set_state(self): + return SetState(self, self._subscription_manager) + + def get_state(self): + return GetState(self) + + def here_now(self): + return HereNow(self) + + def publish(self): + return Publish(self, self._publish_sequence_manager) \ No newline at end of file diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 0adce3e1..3bae99a2 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -18,20 +18,12 @@ from . import utils from .callbacks import SubscribeCallback -from .builders import SubscribeBuilder, UnsubscribeBuilder -from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup -from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup -from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup -from .endpoints.channel_groups.remove_channel_group import RemoveChannelGroup -from .endpoints.presence.heartbeat import Heartbeat -from .endpoints.presence.set_state import SetState -from .endpoints.presence.get_state import GetState from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe from .enums import PNStatusCategory, PNHeartbeatNotificationOptions from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED from .exceptions import PubNubException -from .managers import SubscriptionManager +from .managers import SubscriptionManager, PublishSequenceManager from .pubnub_core import PubNubCore from .structures import ResponseInfo from .workers import SubscribeMessageWorker @@ -107,11 +99,12 @@ def sdk_platform(self): def __init__(self, config, custom_ioloop=None): super(PubNubTornado, self).__init__(config) self.ioloop = custom_ioloop or ioloop.IOLoop.instance() - self._subscription_manager = None if self.config.enable_subscribe: self._subscription_manager = TornadoSubscriptionManager(self) + # TODO: replace with platform-specific manager + self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) # TODO: choose a correct client here http://www.tornadoweb.org/en/stable/httpclient.html # TODO: 1000? self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) @@ -128,33 +121,6 @@ def add_listener(self, listener): else: raise Exception("Subscription manager is not enabled for this instance") - def heartbeat(self): - return Heartbeat(self) - - def subscribe(self): - return SubscribeBuilder(self._subscription_manager) - - def unsubscribe(self): - return UnsubscribeBuilder(self._subscription_manager) - - def set_state(self): - return SetState(self, self._subscription_manager) - - def get_state(self): - return GetState(self) - - def add_channel_to_channel_group(self): - return AddChannelToChannelGroup(self) - - def remove_channel_from_channel_group(self): - return RemoveChannelFromChannelGroup(self) - - def list_channels_in_channel_group(self): - return ListChannelsInChannelGroup(self) - - def remove_channel_group(self): - return RemoveChannelGroup(self) - # TODO: extract this into a separate class def request_sync(self, *args): raise NotImplementedError From ed7ea93728ec88f7cd459fb5b4c38bac9418968b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 03:27:22 -0700 Subject: [PATCH 169/468] Add Native state getter/setter integrational tests --- tests/integrational/native/test_state.py | 89 +++++++++++++++++++++++ tests/integrational/tornado/test_state.py | 4 - 2 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 tests/integrational/native/test_state.py diff --git a/tests/integrational/native/test_state.py b/tests/integrational/native/test_state.py new file mode 100644 index 00000000..6011779b --- /dev/null +++ b/tests/integrational/native/test_state.py @@ -0,0 +1,89 @@ +import threading + +from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult +from pubnub.pubnub import PubNub + +import unittest +import logging +import pubnub +from tests import helper +from tests.helper import pnconf, pnconf_copy + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubSyncHereNow(unittest.TestCase): + def test_success(self): + res = PubNub(pnconf).here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .sync() + + print(res.total_occupancy) + + +class TestPubNubAsyncHereNow(unittest.TestCase): + def setUp(self): + self.event = threading.Event() + + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() + + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + state = {"name": "Alex", "count": 5} + + pubnub.set_state() \ + .channels(ch) \ + .state(state) \ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNSetStateResult) + assert self.response.state['name'] == "Alex" + assert self.response.state['count'] == 5 + + self.event.clear() + pubnub.get_state() \ + .channels(ch) \ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNGetStateResult) + assert self.response.channels[ch]['name'] == "Alex" + assert self.response.channels[ch]['count'] == 5 + + def test_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + state = {"name": "Alex", "count": 5} + + pubnub.set_state() \ + .channels([ch1, ch2]) \ + .state(state) \ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNSetStateResult) + assert self.response.state['name'] == "Alex" + assert self.response.state['count'] == 5 + + self.event.clear() + pubnub.get_state() \ + .channels([ch1, ch2]) \ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNGetStateResult) + assert self.response.channels[ch1]['name'] == "Alex" + assert self.response.channels[ch1]['count'] == 5 + assert self.response.channels[ch2]['name'] == "Alex" + assert self.response.channels[ch2]['count'] == 5 diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index 892b469f..c06139df 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -1,9 +1,5 @@ import tornado -from tornado import gen -from tornado.locks import Event from tornado.testing import AsyncHTTPTestCase, AsyncTestCase - -from pubnub.callbacks import SubscribeCallback from pubnub.pubnub_tornado import PubNubTornado from tests import helper from tests.helper import pnconf From a8e1022d694d19e4e3b9550867ba1c7556da7ac0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 06:03:51 -0700 Subject: [PATCH 170/468] Add Native state getter/setter sync tests --- tests/integrational/native/test_state.py | 50 ++++++++++++++++++------ 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/tests/integrational/native/test_state.py b/tests/integrational/native/test_state.py index 6011779b..1e46a6db 100644 --- a/tests/integrational/native/test_state.py +++ b/tests/integrational/native/test_state.py @@ -1,25 +1,53 @@ +import unittest +import logging +import pubnub import threading from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub - -import unittest -import logging -import pubnub from tests import helper -from tests.helper import pnconf, pnconf_copy +from tests.helper import pnconf_copy pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubSyncHereNow(unittest.TestCase): - def test_success(self): - res = PubNub(pnconf).here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .sync() + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + state = {"name": "Alex", "count": 5} + + result = pubnub.set_state().channels(ch).state(state).sync() + + assert isinstance(result, PNSetStateResult) + assert result.state['name'] == "Alex" + assert result.state['count'] == 5 + + result = pubnub.get_state().channels(ch).sync() + + assert isinstance(result, PNGetStateResult) + assert result.channels[ch]['name'] == "Alex" + assert result.channels[ch]['count'] == 5 + + def test_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + state = {"name": "Alex", "count": 5} + + result = pubnub.set_state().channels([ch1, ch2]).state(state).sync() + + assert isinstance(result, PNSetStateResult) + assert result.state['name'] == "Alex" + assert result.state['count'] == 5 + + result = pubnub.get_state().channels([ch1, ch2]).sync() - print(res.total_occupancy) + assert isinstance(result, PNGetStateResult) + assert result.channels[ch1]['name'] == "Alex" + assert result.channels[ch1]['count'] == 5 + assert result.channels[ch2]['name'] == "Alex" + assert result.channels[ch2]['count'] == 5 class TestPubNubAsyncHereNow(unittest.TestCase): From e81ad0c20833965310a3d06286e0203b7e60e280 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 09:12:11 -0700 Subject: [PATCH 171/468] Add Native CG async methods tests --- pubnub/pubnub.py | 5 +- tests/helper.py | 5 +- .../native/test_channel_groups.py | 179 ++++++++++++++++++ 3 files changed, 184 insertions(+), 5 deletions(-) create mode 100644 tests/integrational/native/test_channel_groups.py diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index b15fb68d..49768f53 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -156,7 +156,10 @@ def stop(self): self._subscription_manager.stop() def request_deferred(self, options_func): - raise PubNubException(pn_error=PNERR_DEFERRED_NOT_IMPLEMENTED) + raise NotImplementedError + + def request_future(self, *args, **kwargs): + raise NotImplementedError def add_listener(self, listener): assert isinstance(listener, SubscribeCallback) diff --git a/tests/helper.py b/tests/helper.py index debc78f8..379da857 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,12 +1,9 @@ import threading - import string - import random -from copy import copy +from copy import copy from pubnub import utils - from pubnub.pnconfiguration import PNConfiguration pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" diff --git a/tests/integrational/native/test_channel_groups.py b/tests/integrational/native/test_channel_groups.py new file mode 100644 index 00000000..b685464c --- /dev/null +++ b/tests/integrational/native/test_channel_groups.py @@ -0,0 +1,179 @@ +import threading + +import time + +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ + PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult +from pubnub.pubnub import PubNub + +import unittest +import logging +import pubnub +from tests import helper +from tests.helper import pnconf_copy + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubAsyncHereNow(unittest.TestCase): + def setUp(self): + self.event = threading.Event() + + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() + + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + + # add + pubnub.add_channel_to_channel_group() \ + .channels(ch)\ + .channel_group(gr)\ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNChannelGroupsAddChannelResult) + self.event.clear() + + time.sleep(1) + + # list + pubnub.list_channels_in_channel_group()\ + .channel_group(gr)\ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsListResult) + assert len(self.response.channels) == 1 + assert self.response.channels[0] == ch + self.event.clear() + + # remove + pubnub.remove_channel_from_channel_group() \ + .channels(ch)\ + .channel_group(gr)\ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsRemoveChannelResult) + self.event.clear() + + time.sleep(1) + + # list + pubnub.list_channels_in_channel_group()\ + .channel_group(gr)\ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsListResult) + assert len(self.response.channels) == 0 + self.event.clear() + + def test_add_remove_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + + # add + pubnub.add_channel_to_channel_group() \ + .channels([ch1, ch2]) \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNChannelGroupsAddChannelResult) + self.event.clear() + + time.sleep(1) + + # list + pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsListResult) + assert len(self.response.channels) == 2 + assert ch1 in self.response.channels + assert ch2 in self.response.channels + self.event.clear() + + # remove + pubnub.remove_channel_from_channel_group() \ + .channels([ch1, ch2]) \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsRemoveChannelResult) + self.event.clear() + + time.sleep(1) + + # list + pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsListResult) + assert len(self.response.channels) == 0 + self.event.clear() + + def test_add_channel_remove_group(self): + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + + # add + pubnub.add_channel_to_channel_group() \ + .channels(ch) \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNChannelGroupsAddChannelResult) + self.event.clear() + + time.sleep(1) + + # list + pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsListResult) + assert len(self.response.channels) == 1 + assert self.response.channels[0] == ch + self.event.clear() + + # remove + pubnub.remove_channel_group() \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsRemoveGroupResult) + self.event.clear() + + time.sleep(1) + + # list + pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .async(self.callback) + + self.event.wait() + assert isinstance(self.response, PNChannelGroupsListResult) + assert len(self.response.channels) == 0 + self.event.clear() \ No newline at end of file From fe35f7db7c8e9c7d46b7c1c5f97bc01338053aa2 Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Wed, 6 Jul 2016 18:23:20 +0200 Subject: [PATCH 172/468] Fixed cg --- pubnub.py | 4 ++-- python/examples/subscribe_group.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub.py b/pubnub.py index 1e605bdb..db3a1841 100755 --- a/pubnub.py +++ b/pubnub.py @@ -949,7 +949,7 @@ def state(self, channel=None, channel_group=None, uuid=None, state=None, try: if (channel and self.subscriptions[channel] and - self.subscriptions[channel].subscribed and + self.subscriptions[channel]['subscribed'] and state is not None): self.STATE[channel] = state except KeyError: @@ -958,7 +958,7 @@ def state(self, channel=None, channel_group=None, uuid=None, state=None, if channel_group and state is not None: try: if (self.subscription_groups[channel_group] and - self.subscription_groups[channel_group].subscribed): + self.subscription_groups[channel_group]['subscribed']): self.STATE[channel_group] = state except KeyError: pass diff --git a/python/examples/subscribe_group.py b/python/examples/subscribe_group.py index b6228f66..2ffd3dba 100755 --- a/python/examples/subscribe_group.py +++ b/python/examples/subscribe_group.py @@ -29,7 +29,7 @@ def callback_abc(message, channel, real_channel): print(str(message) + ' , ' + channel + ', ' + real_channel) - pubnub.unsubscribe_group(channel_group='abc') + # pubnub.unsubscribe_group(channel_group='abc') # pubnub.stop() From 6d43dd4af61a435bc50041d4341813959ef6e772 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 10:00:09 -0700 Subject: [PATCH 173/468] Split native tests into the sync and the threaded folders --- .../{native => native_sync}/__init__.py | 0 .../native_sync/test_channel_groups.py | 13 ++ .../native_sync/test_here_now.py | 18 ++ .../{native => native_sync}/test_publish.py | 173 +---------------- tests/integrational/native_sync/test_state.py | 49 +++++ .../__init__.py} | 0 .../test_channel_groups.py | 12 +- .../test_here_now.py | 16 +- .../native_threads/test_publish.py | 181 ++++++++++++++++++ .../{native => native_threads}/test_state.py | 41 +--- .../test_subscribe.py | 0 11 files changed, 271 insertions(+), 232 deletions(-) rename tests/integrational/{native => native_sync}/__init__.py (100%) create mode 100644 tests/integrational/native_sync/test_channel_groups.py create mode 100644 tests/integrational/native_sync/test_here_now.py rename tests/integrational/{native => native_sync}/test_publish.py (61%) create mode 100644 tests/integrational/native_sync/test_state.py rename tests/integrational/{native/native_helper.py => native_threads/__init__.py} (100%) rename tests/integrational/{native => native_threads}/test_channel_groups.py (98%) rename tests/integrational/{native => native_threads}/test_here_now.py (63%) create mode 100644 tests/integrational/native_threads/test_publish.py rename tests/integrational/{native => native_threads}/test_state.py (62%) rename tests/integrational/{native => native_threads}/test_subscribe.py (100%) diff --git a/tests/integrational/native/__init__.py b/tests/integrational/native_sync/__init__.py similarity index 100% rename from tests/integrational/native/__init__.py rename to tests/integrational/native_sync/__init__.py diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py new file mode 100644 index 00000000..abc667fe --- /dev/null +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -0,0 +1,13 @@ +import threading +import unittest +import logging +import pubnub +import time + +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ + PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult +from pubnub.pubnub import PubNub +from tests import helper +from tests.helper import pnconf_copy + +pubnub.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native_sync/test_here_now.py b/tests/integrational/native_sync/test_here_now.py new file mode 100644 index 00000000..a094e020 --- /dev/null +++ b/tests/integrational/native_sync/test_here_now.py @@ -0,0 +1,18 @@ +from pubnub.pubnub import PubNub + +import unittest +import logging +import pubnub +from tests.helper import pnconf + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubSyncHereNow(unittest.TestCase): + def test_success(self): + res = PubNub(pnconf).here_now() \ + .channels(["ch1", "ch2", "ch3", "demo"]) \ + .include_state(False) \ + .sync() + + print(res.total_occupancy) diff --git a/tests/integrational/native/test_publish.py b/tests/integrational/native_sync/test_publish.py similarity index 61% rename from tests/integrational/native/test_publish.py rename to tests/integrational/native_sync/test_publish.py index 49f47cb1..5ae848b1 100644 --- a/tests/integrational/native/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -1,5 +1,4 @@ import logging -import threading import unittest import pubnub @@ -12,7 +11,7 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubSyncPublish(unittest.TestCase): +class TestPubNubPublish(unittest.TestCase): # @vcr.use_cassette('integrational/fixtures/publish/publish_string_get.yaml', # filter_query_parameters=['uuid']) def test_publish_string_get(self): @@ -270,173 +269,3 @@ def test_publish_do_not_store(self): assert res.timetoken > 1 except PubNubException as e: self.fail(e) - - -class TestPubNubAsyncSuccessPublish(unittest.TestCase): - def setUp(self): - self.event = threading.Event() - - def callback(self, response, status): - self.response = response - self.status = status - self.event.set() - - def assert_success(self): - self.event.wait() - assert not self.status.is_error() - assert isinstance(self.response, PNPublishResult) - assert self.response.timetoken > 1 - - def assert_success_publish_get(self, msg): - PubNub(pnconf).publish() \ - .channel("ch1") \ - .message(msg) \ - .async(self.callback) - - self.assert_success() - - def assert_success_publish_post(self, msg): - PubNub(pnconf).publish() \ - .channel("ch1") \ - .message(msg) \ - .use_post(True) \ - .async(self.callback) - - self.assert_success() - - def test_publish_get(self): - self.assert_success_publish_get("hi") - self.assert_success_publish_get(5) - self.assert_success_publish_get(True) - self.assert_success_publish_get(["hi", "hi2", "hi3"]) - self.assert_success_publish_get({"name": "Alex", "online": True}) - - def test_publish_post(self): - self.assert_success_publish_post("hi") - self.assert_success_publish_post(5) - self.assert_success_publish_post(True) - self.assert_success_publish_post(["hi", "hi2", "hi3"]) - self.assert_success_publish_post({"name": "Alex", "online": True}) - - def test_publish_encrypted_list_get(self): - pubnub = PubNub(pnconf_enc) - - pubnub.publish() \ - .channel("ch1") \ - .message(["encrypted", "list"]) \ - .async(self.callback) - - self.assert_success() - - def test_publish_encrypted_string_get(self): - PubNub(pnconf_enc).publish() \ - .channel("ch1") \ - .message("encrypted string") \ - .async(self.callback) - - self.assert_success() - - def test_publish_encrypted_list_post(self): - PubNub(pnconf_enc).publish() \ - .channel("ch1") \ - .message(["encrypted", "list"]) \ - .use_post(True) \ - .async(self.callback) - - self.assert_success() - - def test_publish_encrypted_string_post(self): - PubNub(pnconf_enc).publish() \ - .channel("ch1") \ - .message("encrypted string") \ - .use_post(True) \ - .async(self.callback) - - self.assert_success() - - def test_publish_with_meta(self): - meta = {'a': 2, 'b': 'qwer'} - - PubNub(pnconf_enc).publish() \ - .channel("ch1") \ - .message("hey") \ - .meta(meta) \ - .async(self.callback) - - self.assert_success() - - def test_publish_do_not_store(self): - PubNub(pnconf_enc).publish() \ - .channel("ch1") \ - .message("hey") \ - .should_store(False) \ - .async(self.callback) - - self.assert_success() - - -class TestPubNubAsyncErrorPublish(unittest.TestCase): - def setUp(self): - self.event = threading.Event() - - def callback(self, response, status): - self.response = response - self.status = status - self.event.set() - - def test_invalid_key(self): - self.invalid_key_message = "" - config = PNConfiguration() - config.publish_key = "fake" - config.subscribe_key = "demo" - config.enable_subscribe = False - - PubNub(config).publish() \ - .channel("ch1") \ - .message("hey") \ - .async(self.callback) - - self.event.wait() - - assert self.status.is_error() - assert self.status.original_response[0] is 0 - assert self.status.original_response[1] == 'Invalid Key' - assert "HTTP Client Error (400):" in str(self.status.error_data.exception) - assert "Invalid Key" in str(self.status.error_data.exception) - - def test_missing_message(self): - PubNub(pnconf).publish() \ - .channel("ch1") \ - .message(None) \ - .async(self.callback) - - self.event.wait() - - assert self.status.is_error() - assert self.response is None - assert "Message missing" in str(self.status.error_data.exception) - - def test_missing_chanel(self): - PubNub(pnconf).publish() \ - .channel("") \ - .message("hey") \ - .async(self.callback) - - assert self.status.is_error() - assert self.response is None - assert "Channel missing" in str(self.status.error_data.exception) - - def test_non_serializable(self): - def method(): - pass - - PubNub(pnconf).publish() \ - .channel("ch1") \ - .message(method) \ - .async(self.callback) - - self.event.wait() - - assert self.status.is_error() - assert self.response is None - assert "not JSON serializable" in str(self.status.error_data.exception) diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py new file mode 100644 index 00000000..11d350be --- /dev/null +++ b/tests/integrational/native_sync/test_state.py @@ -0,0 +1,49 @@ +import unittest +import logging +import pubnub + +from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult +from pubnub.pubnub import PubNub +from tests import helper +from tests.helper import pnconf_copy + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubHereNow(unittest.TestCase): + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + state = {"name": "Alex", "count": 5} + + result = pubnub.set_state().channels(ch).state(state).sync() + + assert isinstance(result, PNSetStateResult) + assert result.state['name'] == "Alex" + assert result.state['count'] == 5 + + result = pubnub.get_state().channels(ch).sync() + + assert isinstance(result, PNGetStateResult) + assert result.channels[ch]['name'] == "Alex" + assert result.channels[ch]['count'] == 5 + + def test_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + state = {"name": "Alex", "count": 5} + + result = pubnub.set_state().channels([ch1, ch2]).state(state).sync() + + assert isinstance(result, PNSetStateResult) + assert result.state['name'] == "Alex" + assert result.state['count'] == 5 + + result = pubnub.get_state().channels([ch1, ch2]).sync() + + assert isinstance(result, PNGetStateResult) + assert result.channels[ch1]['name'] == "Alex" + assert result.channels[ch1]['count'] == 5 + assert result.channels[ch2]['name'] == "Alex" + assert result.channels[ch2]['count'] == 5 diff --git a/tests/integrational/native/native_helper.py b/tests/integrational/native_threads/__init__.py similarity index 100% rename from tests/integrational/native/native_helper.py rename to tests/integrational/native_threads/__init__.py diff --git a/tests/integrational/native/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py similarity index 98% rename from tests/integrational/native/test_channel_groups.py rename to tests/integrational/native_threads/test_channel_groups.py index b685464c..ce1544bf 100644 --- a/tests/integrational/native/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -1,21 +1,19 @@ import threading - import time +import unittest +import logging +import pubnub from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub - -import unittest -import logging -import pubnub from tests import helper from tests.helper import pnconf_copy pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubAsyncHereNow(unittest.TestCase): +class TestPubNubHereNow(unittest.TestCase): def setUp(self): self.event = threading.Event() @@ -176,4 +174,4 @@ def test_add_channel_remove_group(self): self.event.wait() assert isinstance(self.response, PNChannelGroupsListResult) assert len(self.response.channels) == 0 - self.event.clear() \ No newline at end of file + self.event.clear() diff --git a/tests/integrational/native/test_here_now.py b/tests/integrational/native_threads/test_here_now.py similarity index 63% rename from tests/integrational/native/test_here_now.py rename to tests/integrational/native_threads/test_here_now.py index b6a5ec1f..3940d355 100644 --- a/tests/integrational/native/test_here_now.py +++ b/tests/integrational/native_threads/test_here_now.py @@ -1,24 +1,14 @@ -from pubnub.pubnub import PubNub - import unittest import logging import pubnub + +from pubnub.pubnub import PubNub from tests.helper import pnconf pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubSyncHereNow(unittest.TestCase): - def test_success(self): - res = PubNub(pnconf).here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .sync() - - print(res.total_occupancy) - - -class TestPubNubAsyncHereNow(unittest.TestCase): +class TestPubNubHereNow(unittest.TestCase): def test_success(self): def callback(res, status): print("response", res) diff --git a/tests/integrational/native_threads/test_publish.py b/tests/integrational/native_threads/test_publish.py new file mode 100644 index 00000000..edc3a877 --- /dev/null +++ b/tests/integrational/native_threads/test_publish.py @@ -0,0 +1,181 @@ +import logging +import threading +import unittest +import pubnub + +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub +from tests.helper import pnconf, pnconf_enc + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubSuccessPublish(unittest.TestCase): + def setUp(self): + self.event = threading.Event() + + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() + + def assert_success(self): + self.event.wait() + assert not self.status.is_error() + assert isinstance(self.response, PNPublishResult) + assert self.response.timetoken > 1 + + def assert_success_publish_get(self, msg): + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(msg) \ + .async(self.callback) + + self.assert_success() + + def assert_success_publish_post(self, msg): + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(msg) \ + .use_post(True) \ + .async(self.callback) + + self.assert_success() + + def test_publish_get(self): + self.assert_success_publish_get("hi") + self.assert_success_publish_get(5) + self.assert_success_publish_get(True) + self.assert_success_publish_get(["hi", "hi2", "hi3"]) + self.assert_success_publish_get({"name": "Alex", "online": True}) + + def test_publish_post(self): + self.assert_success_publish_post("hi") + self.assert_success_publish_post(5) + self.assert_success_publish_post(True) + self.assert_success_publish_post(["hi", "hi2", "hi3"]) + self.assert_success_publish_post({"name": "Alex", "online": True}) + + def test_publish_encrypted_list_get(self): + pubnub = PubNub(pnconf_enc) + + pubnub.publish() \ + .channel("ch1") \ + .message(["encrypted", "list"]) \ + .async(self.callback) + + self.assert_success() + + def test_publish_encrypted_string_get(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string") \ + .async(self.callback) + + self.assert_success() + + def test_publish_encrypted_list_post(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message(["encrypted", "list"]) \ + .use_post(True) \ + .async(self.callback) + + self.assert_success() + + def test_publish_encrypted_string_post(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("encrypted string") \ + .use_post(True) \ + .async(self.callback) + + self.assert_success() + + def test_publish_with_meta(self): + meta = {'a': 2, 'b': 'qwer'} + + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("hey") \ + .meta(meta) \ + .async(self.callback) + + self.assert_success() + + def test_publish_do_not_store(self): + PubNub(pnconf_enc).publish() \ + .channel("ch1") \ + .message("hey") \ + .should_store(False) \ + .async(self.callback) + + self.assert_success() + + +class TestPubNubErrorPublish(unittest.TestCase): + def setUp(self): + self.event = threading.Event() + + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() + + def test_invalid_key(self): + self.invalid_key_message = "" + config = PNConfiguration() + config.publish_key = "fake" + config.subscribe_key = "demo" + config.enable_subscribe = False + + PubNub(config).publish() \ + .channel("ch1") \ + .message("hey") \ + .async(self.callback) + + self.event.wait() + + assert self.status.is_error() + assert self.status.original_response[0] is 0 + assert self.status.original_response[1] == 'Invalid Key' + assert "HTTP Client Error (400):" in str(self.status.error_data.exception) + assert "Invalid Key" in str(self.status.error_data.exception) + + def test_missing_message(self): + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(None) \ + .async(self.callback) + + self.event.wait() + + assert self.status.is_error() + assert self.response is None + assert "Message missing" in str(self.status.error_data.exception) + + def test_missing_chanel(self): + PubNub(pnconf).publish() \ + .channel("") \ + .message("hey") \ + .async(self.callback) + + assert self.status.is_error() + assert self.response is None + assert "Channel missing" in str(self.status.error_data.exception) + + def test_non_serializable(self): + def method(): + pass + + PubNub(pnconf).publish() \ + .channel("ch1") \ + .message(method) \ + .async(self.callback) + + self.event.wait() + + assert self.status.is_error() + assert self.response is None + assert "not JSON serializable" in str(self.status.error_data.exception) diff --git a/tests/integrational/native/test_state.py b/tests/integrational/native_threads/test_state.py similarity index 62% rename from tests/integrational/native/test_state.py rename to tests/integrational/native_threads/test_state.py index 1e46a6db..099eefd0 100644 --- a/tests/integrational/native/test_state.py +++ b/tests/integrational/native_threads/test_state.py @@ -11,46 +11,7 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubSyncHereNow(unittest.TestCase): - def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") - pubnub = PubNub(pnconf_copy()) - state = {"name": "Alex", "count": 5} - - result = pubnub.set_state().channels(ch).state(state).sync() - - assert isinstance(result, PNSetStateResult) - assert result.state['name'] == "Alex" - assert result.state['count'] == 5 - - result = pubnub.get_state().channels(ch).sync() - - assert isinstance(result, PNGetStateResult) - assert result.channels[ch]['name'] == "Alex" - assert result.channels[ch]['count'] == 5 - - def test_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") - pubnub = PubNub(pnconf_copy()) - state = {"name": "Alex", "count": 5} - - result = pubnub.set_state().channels([ch1, ch2]).state(state).sync() - - assert isinstance(result, PNSetStateResult) - assert result.state['name'] == "Alex" - assert result.state['count'] == 5 - - result = pubnub.get_state().channels([ch1, ch2]).sync() - - assert isinstance(result, PNGetStateResult) - assert result.channels[ch1]['name'] == "Alex" - assert result.channels[ch1]['count'] == 5 - assert result.channels[ch2]['name'] == "Alex" - assert result.channels[ch2]['count'] == 5 - - -class TestPubNubAsyncHereNow(unittest.TestCase): +class TestPubNubHereNow(unittest.TestCase): def setUp(self): self.event = threading.Event() diff --git a/tests/integrational/native/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py similarity index 100% rename from tests/integrational/native/test_subscribe.py rename to tests/integrational/native_threads/test_subscribe.py From 9a0a2ec8affb7dd2d147ad5674f02cd581c2bcf0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 11:08:17 -0700 Subject: [PATCH 174/468] Add Native sync CG integrational tests --- .../native_sync/test_channel_groups.py | 129 ++++++++++++++++++ .../native_threads/test_channel_groups.py | 2 +- 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index abc667fe..4b314559 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -11,3 +11,132 @@ from tests.helper import pnconf_copy pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubChannelGroups(unittest.TestCase): + def test_single_channel(self): + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + + # add + result = pubnub.add_channel_to_channel_group() \ + .channels(ch)\ + .channel_group(gr)\ + .sync() + + assert isinstance(result, PNChannelGroupsAddChannelResult) + + time.sleep(1) + + # list + result = pubnub.list_channels_in_channel_group()\ + .channel_group(gr)\ + .sync() + + assert isinstance(result, PNChannelGroupsListResult) + assert len(result.channels) == 1 + assert result.channels[0] == ch + + # remove + result = pubnub.remove_channel_from_channel_group() \ + .channels(ch)\ + .channel_group(gr)\ + .sync() + + assert isinstance(result, PNChannelGroupsRemoveChannelResult) + + time.sleep(1) + + # list + result = pubnub.list_channels_in_channel_group()\ + .channel_group(gr)\ + .sync() + + assert isinstance(result, PNChannelGroupsListResult) + assert len(result.channels) == 0 + + def test_add_remove_multiple_channels(self): + ch1 = helper.gen_channel("herenow-unit") + ch2 = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + + # add + result = pubnub.add_channel_to_channel_group() \ + .channels([ch1, ch2]) \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsAddChannelResult) + + time.sleep(1) + + # list + result = pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsListResult) + assert len(result.channels) == 2 + assert ch1 in result.channels + assert ch2 in result.channels + + # remove + result = pubnub.remove_channel_from_channel_group() \ + .channels([ch1, ch2]) \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsRemoveChannelResult) + + time.sleep(1) + + # list + result = pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsListResult) + assert len(result.channels) == 0 + + def test_add_channel_remove_group(self): + ch = helper.gen_channel("herenow-unit") + gr = helper.gen_channel("herenow-unit") + pubnub = PubNub(pnconf_copy()) + + # add + result = pubnub.add_channel_to_channel_group() \ + .channels(ch) \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsAddChannelResult) + + time.sleep(1) + + # list + result = pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsListResult) + assert len(result.channels) == 1 + assert result.channels[0] == ch + + # remove + result = pubnub.remove_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsRemoveGroupResult) + + time.sleep(1) + + # list + result = pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(result, PNChannelGroupsListResult) + assert len(result.channels) == 0 diff --git a/tests/integrational/native_threads/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py index ce1544bf..4e52574e 100644 --- a/tests/integrational/native_threads/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -13,7 +13,7 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubHereNow(unittest.TestCase): +class TestPubNubChannelGroups(unittest.TestCase): def setUp(self): self.event = threading.Event() From 2fc630620d8cf51d8f0d8dcbf0f36a380db76dc8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 6 Jul 2016 11:26:15 -0700 Subject: [PATCH 175/468] Fix test naming --- tests/integrational/native_sync/test_state.py | 2 +- tests/integrational/native_threads/test_state.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py index 11d350be..4414c5b0 100644 --- a/tests/integrational/native_sync/test_state.py +++ b/tests/integrational/native_sync/test_state.py @@ -10,7 +10,7 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubHereNow(unittest.TestCase): +class TestPubNubState(unittest.TestCase): def test_single_channel(self): ch = helper.gen_channel("herenow-unit") pubnub = PubNub(pnconf_copy()) diff --git a/tests/integrational/native_threads/test_state.py b/tests/integrational/native_threads/test_state.py index 099eefd0..5f351f3a 100644 --- a/tests/integrational/native_threads/test_state.py +++ b/tests/integrational/native_threads/test_state.py @@ -11,7 +11,7 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubHereNow(unittest.TestCase): +class TestPubNubState(unittest.TestCase): def setUp(self): self.event = threading.Event() From d6bb9890bee7bb5753d8a5d5828d464c4fef3c7d Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 6 Jul 2016 12:30:38 -0700 Subject: [PATCH 176/468] 3.8.1 --- CHANGELOG | 5 ++++- VERSION | 2 +- pubnub.py | 4 ++-- setup.py | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 15c3c851..7d377938 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ +3.8.1 +. Fixing bug with state setting and subscribe confirmation. + 3.8.0 . Mobile Gateway Functions. . Here Now for channel groups @@ -10,7 +13,7 @@ 3.7.6 - 02-10-2015 - 3012d7e . fixed issues in receiving gzipped response for twisted . fix for non reporting of dns lookup failure -. fix in time method +. fix in time method 3.7.5 - 12-08-2015 - 61f1adc . increased timeout to 15 sec diff --git a/VERSION b/VERSION index 19811903..f2807196 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.0 +3.8.1 diff --git a/pubnub.py b/pubnub.py index 043b2158..1e97f0eb 100755 --- a/pubnub.py +++ b/pubnub.py @@ -6,7 +6,7 @@ # http://www.pubnub.com/ # ----------------------------------- -# PubNub 3.8.0 Real-time Push Cloud API +# PubNub 3.8.1 Real-time Push Cloud API # ----------------------------------- @@ -305,7 +305,7 @@ def __init__( """ self.origin = origin - self.version = '3.8.0' + self.version = '3.8.1' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key diff --git a/setup.py b/setup.py index 7ffbd56e..ae648908 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='3.8.0', + version='3.8.1', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From cb47c8c5e6d80596021a59f5c2d799e86b24fc71 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 8 Jul 2016 03:48:44 -0700 Subject: [PATCH 177/468] Add Native/Threads subscribe sub/unsub sub/pub/unsub tests --- pubnub/managers.py | 5 +- pubnub/pubnub.py | 34 ++-- .../native_threads/test_subscribe.py | 156 ++++++++++++------ 3 files changed, 135 insertions(+), 60 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index 4a1cda28..2ca6e850 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -201,10 +201,9 @@ def adapt_unsubscribe_builder(self, unsubscribe_operation): self._timetoken = 0 self.reconnect() + @abstractmethod def reconnect(self): - self._should_stop = False - self._start_subscribe_loop() - self._register_heartbeat_timer() + pass def stop(self): self._should_stop = True diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 49768f53..b0df3351 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -2,6 +2,7 @@ import threading import requests +from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe from .workers import SubscribeMessageWorker from .pnconfiguration import PNConfiguration @@ -10,7 +11,7 @@ from .structures import RequestOptions, ResponseInfo from .enums import PNStatusCategory from .callbacks import SubscribeCallback -from .errors import PNERR_DEFERRED_NOT_IMPLEMENTED, PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, \ +from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, \ PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR from .exceptions import PubNubException from .pubnub_core import PubNubCore @@ -64,10 +65,10 @@ def request_sync(self, options): return res def request_async(self, endpoint_name, options, callback, cancellation_event): + # TODO: Rename to AsyncRequest call = Call() def success_callback(res): - # http error status_category = PNStatusCategory.PNUnknownCategory response_info = None @@ -116,7 +117,7 @@ def success_callback(res): )) call.executed_cb() else: - callback(status_category, res.json(), response_info, None) + callback(PNStatusCategory.PNAcknowledgmentCategory, res.json(), response_info, None) call.executed_cb() def error_callback(e): @@ -142,7 +143,7 @@ def error_callback(e): thread = threading.Thread( target=client.run, - name="%sEndpointThread-%d" % (endpoint_name, ++PubNub.ENTITY_THREAD_COUNTER) + name="EndpointThread-%s-%d" % (endpoint_name, ++PubNub.ENTITY_THREAD_COUNTER) ) thread.setDaemon(True) thread.start() @@ -290,8 +291,19 @@ def executed_cb(self): class NativeSubscriptionManager(SubscriptionManager): + def __init__(self, pubnub_instance): + self._message_queue = utils.Queue() + self._consumer_event = threading.Event() + self._subscribe_call = None + super(NativeSubscriptionManager, self).__init__(pubnub_instance) + def _send_leave(self, unsubscribe_operation): - pass + def leave_callback(result, status): + self._listener_manager.announce_status(status) + + Leave(self._pubnub) \ + .channels(unsubscribe_operation.channels) \ + .channel_groups(unsubscribe_operation.channel_groups).async(leave_callback) def _perform_heartbeat_loop(self): pass @@ -299,17 +311,17 @@ def _perform_heartbeat_loop(self): def _stop_heartbeat_timer(self): pass - def __init__(self, pubnub_instance): - self._message_queue = utils.Queue() - self._consumer_event = threading.Event() - super(NativeSubscriptionManager, self).__init__(pubnub_instance) - def _set_consumer_event(self): self._consumer_event.set() def _message_queue_put(self, message): self._message_queue.put(message) + def reconnect(self): + self._should_stop = False + self._start_subscribe_loop() + self._register_heartbeat_timer() + def _start_worker(self): consumer = NativeSubscribeMessageWorker(self._pubnub, self._listener_manager, self._message_queue, self._consumer_event) @@ -337,7 +349,7 @@ def callback(raw_result, status): return self._handle_endpoint_call(raw_result, status) - + self._start_subscribe_loop() try: self._subscribe_call = Subscribe(self._pubnub) \ .channels(combined_channels).channel_groups(combined_groups) \ diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index 7ff9961b..6db6c027 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -1,62 +1,126 @@ import logging import unittest -import pubnub +import pubnub as pn +from pubnub import utils + +from threading import Event from pubnub.callbacks import SubscribeCallback from pubnub.exceptions import PubNubException +from pubnub.models.consumer.pubsub import PNPublishResult, PNMessageResult from pubnub.pubnub import PubNub -from tests.helper import CountDownLatch, pnconf_sub +from tests.helper import CountDownLatch, pnconf_sub, pnconf_sub_copy +from six.moves.queue import Queue + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +class SubscribeListener(SubscribeCallback): + def __init__(self): + self.connected = False + self.connected_event = Event() + self.disconnected_event = Event() + self.presence_queue = Queue() + self.message_queue = Queue() + + def status(self, pubnub, status): + if utils.is_subscribed_event(status) and not self.connected_event.is_set(): + self.connected_event.set() + elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): + self.disconnected_event.set() + + def message(self, pubnub, message): + self.message_queue.put(message) -pubnub.set_stream_logger('pubnub', logging.DEBUG) + def presence(self, pubnub, presence): + self.presence_queue.put(presence) + + def wait_for_connect(self): + if not self.connected_event.is_set(): + self.connected_event.wait() + else: + raise Exception("the instance is already connected") + + def wait_for_disconnect(self): + if not self.disconnected_event.is_set(): + self.disconnected_event.wait() + else: + raise Exception("the instance is already connected") + + def wait_for_message_on(self, *channel_names): + channel_names = list(channel_names) + while True: + try: + env = self.message_queue.get() + if env.actual_channel in channel_names: + return env + else: + continue + finally: + self.message_queue.task_done() class TestPubNubSubscribe(unittest.TestCase): - # @vcr.use_cassette('integrational/fixtures/publish/publish_string_get.yaml', - # filter_query_parameters=['uuid']) - def test_subscribe_latched(self): - pubnub = PubNub(pnconf_sub) - latch = CountDownLatch() - - class MyCallback(SubscribeCallback): - def __init__(self, l): - super(MyCallback, self).__init__() - - assert isinstance(l, CountDownLatch) - self._latch = l - self.done = False - self.once = False - self.msg = None - - def status(self, p, status): - if not self.once: - self.once = True - p.publish().channel('ch1').message('hey').sync() - - if status.is_error(): - print("error here") - - def presence(self, p, presence): - pass - - def message(self, p, message): - self.done = True - self.msg = message - self._latch.count_down() + def test_subscribe_unsubscribe(self): + pubnub = PubNub(pnconf_sub_copy()) try: - callback = MyCallback(latch) - pubnub.add_listener(callback) - pubnub.subscribe() \ - .channels(["ch1", "ch2"]) \ - .execute() + listener = SubscribeListener() + pubnub.add_listener(listener) - latch.await(10) - - assert callback.done - assert callback.msg.actual_channel == 'ch1' - assert callback.msg.subscribed_channel == 'ch1' - assert callback.msg.message == 'hey' - assert callback.msg.timetoken > 0 + pubnub.subscribe().channels(["ch1", "ch2"]).execute() + listener.wait_for_connect() + pubnub.unsubscribe().channels("ch1,ch2").execute() + listener.wait_for_disconnect() + except PubNubException as e: + self.fail(e) + finally: pubnub.stop() + + def test_subscribe_pub_unsubscribe(self): + class NonSubscribeListener(object): + def __init__(self): + self.result = None + self.done_event = Event() + + def callback(self, result, status): + self.result = result + self.done_event.set() + + def await(self, timeout=5): + """ Returns False if a timeout happened, otherwise True""" + return self.done_event.wait(timeout) + + pubnub = PubNub(pnconf_sub_copy()) + subscribe_listener = SubscribeListener() + publish_operation = NonSubscribeListener() + ch = "ch1" + message = "hey" + + try: + pubnub.add_listener(subscribe_listener) + + pubnub.subscribe().channels(ch).execute() + subscribe_listener.wait_for_connect() + + pubnub.publish().channel(ch).message(message).async(publish_operation.callback) + if not publish_operation.await(): + self.fail("Publish operation timeout") + + publish_result = publish_operation.result + assert isinstance(publish_result, PNPublishResult) + assert publish_result.timetoken > 0 + + result = subscribe_listener.wait_for_message_on(ch) + assert isinstance(result, PNMessageResult) + assert result.actual_channel == ch + assert result.subscribed_channel == ch + assert result.timetoken > 0 + assert result.message == message + + pubnub.unsubscribe().channels("ch1,ch2").execute() + subscribe_listener.wait_for_disconnect() except PubNubException as e: self.fail(e) + finally: + pubnub.stop() From b82c2032e4b80697ae309e8518bdacdc67b935bd Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 8 Jul 2016 06:26:13 -0700 Subject: [PATCH 178/468] Add Native/Threads join/leave test --- .../native_threads/test_subscribe.py | 109 ++++++++++++++---- 1 file changed, 84 insertions(+), 25 deletions(-) diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index 6db6c027..508148c4 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -8,6 +8,7 @@ from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult, PNMessageResult from pubnub.pubnub import PubNub +from tests import helper from tests.helper import CountDownLatch, pnconf_sub, pnconf_sub_copy from six.moves.queue import Queue @@ -49,28 +50,51 @@ def wait_for_disconnect(self): def wait_for_message_on(self, *channel_names): channel_names = list(channel_names) while True: - try: - env = self.message_queue.get() - if env.actual_channel in channel_names: - return env - else: - continue - finally: - self.message_queue.task_done() + env = self.message_queue.get() + self.message_queue.task_done() + if env.actual_channel in channel_names: + return env + else: + continue + + def wait_for_presence_on(self, *channel_names): + channel_names = list(channel_names) + while True: + env = self.presence_queue.get() + self.presence_queue.task_done() + if env.actual_channel[:-7] in channel_names: + return env + else: + continue + + +class NonSubscribeListener(object): + def __init__(self): + self.result = None + self.done_event = Event() + + def callback(self, result, status): + self.result = result + self.done_event.set() + + def await(self, timeout=5): + """ Returns False if a timeout happened, otherwise True""" + return self.done_event.wait(timeout) class TestPubNubSubscribe(unittest.TestCase): def test_subscribe_unsubscribe(self): pubnub = PubNub(pnconf_sub_copy()) + ch = helper.gen_channel("test-subscribe-sub-unsub") try: listener = SubscribeListener() pubnub.add_listener(listener) - pubnub.subscribe().channels(["ch1", "ch2"]).execute() + pubnub.subscribe().channels(ch).execute() listener.wait_for_connect() - pubnub.unsubscribe().channels("ch1,ch2").execute() + pubnub.unsubscribe().channels(ch).execute() listener.wait_for_disconnect() except PubNubException as e: self.fail(e) @@ -78,23 +102,10 @@ def test_subscribe_unsubscribe(self): pubnub.stop() def test_subscribe_pub_unsubscribe(self): - class NonSubscribeListener(object): - def __init__(self): - self.result = None - self.done_event = Event() - - def callback(self, result, status): - self.result = result - self.done_event.set() - - def await(self, timeout=5): - """ Returns False if a timeout happened, otherwise True""" - return self.done_event.wait(timeout) - + ch = helper.gen_channel("test-subscribe-sub-pub-unsub") pubnub = PubNub(pnconf_sub_copy()) subscribe_listener = SubscribeListener() publish_operation = NonSubscribeListener() - ch = "ch1" message = "hey" try: @@ -118,9 +129,57 @@ def await(self, timeout=5): assert result.timetoken > 0 assert result.message == message - pubnub.unsubscribe().channels("ch1,ch2").execute() + pubnub.unsubscribe().channels(ch).execute() subscribe_listener.wait_for_disconnect() except PubNubException as e: self.fail(e) finally: pubnub.stop() + + def test_join_leave(self): + ch = helper.gen_channel("test-subscribe-join-leave") + ch_pnpres = ch + "-pnpres" + + pubnub = PubNub(pnconf_sub_copy()) + pubnub_listener = PubNub(pnconf_sub_copy()) + callback_messages = SubscribeListener() + callback_presence = SubscribeListener() + + pubnub.config.uuid = helper.gen_channel("messenger") + pubnub_listener.config.uuid = helper.gen_channel("listener") + + try: + pubnub.add_listener(callback_messages) + pubnub_listener.add_listener(callback_presence) + + pubnub_listener.subscribe().channels(ch).with_presence().execute() + callback_presence.wait_for_connect() + + envelope = callback_presence.wait_for_presence_on(ch) + assert envelope.actual_channel == ch_pnpres + assert envelope.event == 'join' + assert envelope.uuid == pubnub_listener.uuid + + pubnub.subscribe().channels(ch).execute() + callback_messages.wait_for_connect() + + envelope = callback_presence.wait_for_presence_on(ch) + assert envelope.actual_channel == ch_pnpres + assert envelope.event == 'join' + assert envelope.uuid == pubnub.uuid + + pubnub.unsubscribe().channels(ch).execute() + callback_messages.wait_for_disconnect() + + envelope = callback_presence.wait_for_presence_on(ch) + assert envelope.actual_channel == ch_pnpres + assert envelope.event == 'leave' + assert envelope.uuid == pubnub.uuid + + pubnub_listener.unsubscribe().channels(ch).execute() + callback_presence.wait_for_disconnect() + except PubNubException as e: + self.fail(e) + finally: + pubnub.stop() + pubnub_listener.stop() From ccae47a51919c9a42bbedcc2983e85a4c877c8cc Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 8 Jul 2016 06:31:44 -0700 Subject: [PATCH 179/468] Move Native subscribe and non-subscribe listeners to the platform file --- pubnub/pubnub.py | 70 +++++++++++++++++ .../native_threads/test_subscribe.py | 76 +------------------ 2 files changed, 73 insertions(+), 73 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index b0df3351..40df7b76 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -2,6 +2,9 @@ import threading import requests +# noinspection PyUnresolvedReferences +from six.moves.queue import Queue +from threading import Event from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe from .workers import SubscribeMessageWorker @@ -382,3 +385,70 @@ def _take_message(self): self._queue.task_done() self._event.set() logger.warn("take message interrupted: %s" % str(e)) + + +class SubscribeListener(SubscribeCallback): + def __init__(self): + self.connected = False + self.connected_event = Event() + self.disconnected_event = Event() + self.presence_queue = Queue() + self.message_queue = Queue() + + def status(self, pubnub, status): + if utils.is_subscribed_event(status) and not self.connected_event.is_set(): + self.connected_event.set() + elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): + self.disconnected_event.set() + + def message(self, pubnub, message): + self.message_queue.put(message) + + def presence(self, pubnub, presence): + self.presence_queue.put(presence) + + def wait_for_connect(self): + if not self.connected_event.is_set(): + self.connected_event.wait() + else: + raise Exception("the instance is already connected") + + def wait_for_disconnect(self): + if not self.disconnected_event.is_set(): + self.disconnected_event.wait() + else: + raise Exception("the instance is already connected") + + def wait_for_message_on(self, *channel_names): + channel_names = list(channel_names) + while True: + env = self.message_queue.get() + self.message_queue.task_done() + if env.actual_channel in channel_names: + return env + else: + continue + + def wait_for_presence_on(self, *channel_names): + channel_names = list(channel_names) + while True: + env = self.presence_queue.get() + self.presence_queue.task_done() + if env.actual_channel[:-7] in channel_names: + return env + else: + continue + + +class NonSubscribeListener(object): + def __init__(self): + self.result = None + self.done_event = Event() + + def callback(self, result, status): + self.result = result + self.done_event.set() + + def await(self, timeout=5): + """ Returns False if a timeout happened, otherwise True""" + return self.done_event.wait(timeout) \ No newline at end of file diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index 508148c4..f9f9a4c4 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -1,85 +1,15 @@ import logging import unittest import pubnub as pn -from pubnub import utils -from threading import Event -from pubnub.callbacks import SubscribeCallback from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult, PNMessageResult -from pubnub.pubnub import PubNub +from pubnub.pubnub import PubNub, SubscribeListener, NonSubscribeListener from tests import helper -from tests.helper import CountDownLatch, pnconf_sub, pnconf_sub_copy -from six.moves.queue import Queue - -pn.set_stream_logger('pubnub', logging.DEBUG) +from tests.helper import pnconf_sub_copy -class SubscribeListener(SubscribeCallback): - def __init__(self): - self.connected = False - self.connected_event = Event() - self.disconnected_event = Event() - self.presence_queue = Queue() - self.message_queue = Queue() - - def status(self, pubnub, status): - if utils.is_subscribed_event(status) and not self.connected_event.is_set(): - self.connected_event.set() - elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): - self.disconnected_event.set() - - def message(self, pubnub, message): - self.message_queue.put(message) - - def presence(self, pubnub, presence): - self.presence_queue.put(presence) - - def wait_for_connect(self): - if not self.connected_event.is_set(): - self.connected_event.wait() - else: - raise Exception("the instance is already connected") - - def wait_for_disconnect(self): - if not self.disconnected_event.is_set(): - self.disconnected_event.wait() - else: - raise Exception("the instance is already connected") - - def wait_for_message_on(self, *channel_names): - channel_names = list(channel_names) - while True: - env = self.message_queue.get() - self.message_queue.task_done() - if env.actual_channel in channel_names: - return env - else: - continue - - def wait_for_presence_on(self, *channel_names): - channel_names = list(channel_names) - while True: - env = self.presence_queue.get() - self.presence_queue.task_done() - if env.actual_channel[:-7] in channel_names: - return env - else: - continue - - -class NonSubscribeListener(object): - def __init__(self): - self.result = None - self.done_event = Event() - - def callback(self, result, status): - self.result = result - self.done_event.set() - - def await(self, timeout=5): - """ Returns False if a timeout happened, otherwise True""" - return self.done_event.wait(timeout) +pn.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubSubscribe(unittest.TestCase): From 6539dd64179e2651f5575400991d7f026b9a9443 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 8 Jul 2016 12:07:35 -0700 Subject: [PATCH 180/468] Add Native/Threads CG subscribe tests --- pubnub/pubnub.py | 17 ++- .../native_threads/test_subscribe.py | 138 +++++++++++++++++- tests/integrational/tornado/test_subscribe.py | 6 +- 3 files changed, 156 insertions(+), 5 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 40df7b76..27ad21cd 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,3 +1,4 @@ +import copy import logging import threading import requests @@ -451,4 +452,18 @@ def callback(self, result, status): def await(self, timeout=5): """ Returns False if a timeout happened, otherwise True""" - return self.done_event.wait(timeout) \ No newline at end of file + return self.done_event.wait(timeout) + + def await_result(self, timeout=5): + self.await(timeout) + return self.result + + def await_result_and_reset(self, timeout=5): + self.await(timeout) + cp = copy.copy(self.result) + self.reset() + return cp + + def reset(self): + self.result = None + self.done_event.clear() diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index f9f9a4c4..85e010f1 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -1,8 +1,10 @@ import logging import unittest +import time import pubnub as pn from pubnub.exceptions import PubNubException +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsRemoveChannelResult from pubnub.models.consumer.pubsub import PNPublishResult, PNMessageResult from pubnub.pubnub import PubNub, SubscribeListener, NonSubscribeListener from tests import helper @@ -12,7 +14,7 @@ pn.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubSubscribe(unittest.TestCase): +class TestPubNubSubscription(unittest.TestCase): def test_subscribe_unsubscribe(self): pubnub = PubNub(pnconf_sub_copy()) ch = helper.gen_channel("test-subscribe-sub-unsub") @@ -113,3 +115,137 @@ def test_join_leave(self): finally: pubnub.stop() pubnub_listener.stop() + + def test_cg_subscribe_unsubscribe(self): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") + + pubnub = PubNub(pnconf_sub_copy()) + callback_messages = SubscribeListener() + cg_operation = NonSubscribeListener() + + pubnub.add_channel_to_channel_group()\ + .channel_group(gr)\ + .channels(ch)\ + .async(cg_operation.callback) + result = cg_operation.await_result() + assert isinstance(result, PNChannelGroupsAddChannelResult) + cg_operation.reset() + + time.sleep(1) + + pubnub.add_listener(callback_messages) + pubnub.subscribe().channel_groups(gr).execute() + callback_messages.wait_for_connect() + + pubnub.unsubscribe().channel_groups(gr).execute() + callback_messages.wait_for_disconnect() + + pubnub.remove_channel_from_channel_group()\ + .channel_group(gr)\ + .channels(ch)\ + .async(cg_operation.callback) + result = cg_operation.await_result() + assert isinstance(result, PNChannelGroupsRemoveChannelResult) + + pubnub.stop() + + def test_subscribe_cg_publish_unsubscribe(self): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") + message = "hey" + + pubnub = PubNub(pnconf_sub_copy()) + callback_messages = SubscribeListener() + non_subscribe_listener = NonSubscribeListener() + + pubnub.add_channel_to_channel_group() \ + .channel_group(gr) \ + .channels(ch) \ + .async(non_subscribe_listener.callback) + result = non_subscribe_listener.await_result_and_reset() + assert isinstance(result, PNChannelGroupsAddChannelResult) + + time.sleep(1) + + pubnub.add_listener(callback_messages) + pubnub.subscribe().channel_groups(gr).execute() + callback_messages.wait_for_connect() + + pubnub.publish().message(message).channel(ch).async(non_subscribe_listener.callback) + result = non_subscribe_listener.await_result_and_reset() + assert isinstance(result, PNPublishResult) + assert result.timetoken > 0 + + pubnub.unsubscribe().channel_groups(gr).execute() + callback_messages.wait_for_disconnect() + + pubnub.remove_channel_from_channel_group() \ + .channel_group(gr) \ + .channels(ch) \ + .async(non_subscribe_listener.callback) + result = non_subscribe_listener.await_result_and_reset() + assert isinstance(result, PNChannelGroupsRemoveChannelResult) + + pubnub.stop() + + def test_subscribe_cg_join_leave(self): + ch = helper.gen_channel("test-subscribe-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") + + pubnub = PubNub(pnconf_sub_copy()) + pubnub_listener = PubNub(pnconf_sub_copy()) + non_subscribe_listener = NonSubscribeListener() + + pubnub.add_channel_to_channel_group() \ + .channel_group(gr) \ + .channels(ch) \ + .async(non_subscribe_listener.callback) + result = non_subscribe_listener.await_result_and_reset() + assert isinstance(result, PNChannelGroupsAddChannelResult) + + time.sleep(1) + + callback_messages = SubscribeListener() + callback_presence = SubscribeListener() + + pubnub_listener.add_listener(callback_presence) + pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() + callback_presence.wait_for_connect() + + prs_envelope = callback_presence.wait_for_presence_on(ch) + assert prs_envelope.event == 'join' + assert prs_envelope.uuid == pubnub_listener.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + pubnub.add_listener(callback_messages) + pubnub.subscribe().channel_groups(gr).execute() + + prs_envelope = callback_presence.wait_for_presence_on(ch) + + assert prs_envelope.event == 'join' + assert prs_envelope.uuid == pubnub.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + pubnub.unsubscribe().channel_groups(gr).execute() + prs_envelope = callback_presence.wait_for_presence_on(ch) + + assert prs_envelope.event == 'leave' + assert prs_envelope.uuid == pubnub.uuid + assert prs_envelope.actual_channel == ch + "-pnpres" + assert prs_envelope.subscribed_channel == gr + "-pnpres" + + pubnub_listener.unsubscribe().channel_groups(gr).execute() + callback_presence.wait_for_disconnect() + + pubnub.remove_channel_from_channel_group() \ + .channel_group(gr) \ + .channels(ch) \ + .async(non_subscribe_listener.callback) + result = non_subscribe_listener.await_result_and_reset() + assert isinstance(result, PNChannelGroupsRemoveChannelResult) + + pubnub.stop() + pubnub_listener.stop() \ No newline at end of file diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index fa6e0594..9bd8474d 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -133,8 +133,8 @@ def test_subscribe_unsubscribe(self): @tornado.testing.gen_test(timeout=30) def test_subscribe_publish_unsubscribe(self): - ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscirbe-group") + ch = helper.gen_channel("test-subscribe-pub-unsubscribe-channel") + gr = helper.gen_channel("test-subscribe-pub-unsubscribe-group") message = "hey" envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() @@ -170,7 +170,7 @@ def test_join_leave(self): self.pubnub_listener.config.uuid = helper.gen_channel("listener") ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscirbe-group") + gr = helper.gen_channel("test-subscribe-unsubscribe-group") envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 From 0ed440a4ea35b2c9819419ee2a49b5877c21ec77 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Sat, 9 Jul 2016 21:32:03 -0700 Subject: [PATCH 181/468] add, remove channels for push --- pubnub/endpoints/push/__init__.py | 0 pubnub/endpoints/push/add_channels_to_push.py | 73 +++++++++++++++++++ .../push/remove_channels_from_push.py | 73 +++++++++++++++++++ pubnub/enums.py | 5 ++ pubnub/errors.py | 2 + pubnub/models/consumer/push.py | 6 ++ pubnub/pubnub_core.py | 8 +- pubnub/utils.py | 12 ++- tests/functional/push/__init__.py | 0 .../push/test_add_channels_to_push.py | 71 ++++++++++++++++++ .../push/test_remove_channels_from_push.py | 71 ++++++++++++++++++ 11 files changed, 319 insertions(+), 2 deletions(-) create mode 100644 pubnub/endpoints/push/__init__.py create mode 100644 pubnub/endpoints/push/add_channels_to_push.py create mode 100644 pubnub/endpoints/push/remove_channels_from_push.py create mode 100644 pubnub/models/consumer/push.py create mode 100644 tests/functional/push/__init__.py create mode 100644 tests/functional/push/test_add_channels_to_push.py create mode 100644 tests/functional/push/test_remove_channels_from_push.py diff --git a/pubnub/endpoints/push/__init__.py b/pubnub/endpoints/push/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pubnub/endpoints/push/add_channels_to_push.py b/pubnub/endpoints/push/add_channels_to_push.py new file mode 100644 index 00000000..741c900f --- /dev/null +++ b/pubnub/endpoints/push/add_channels_to_push.py @@ -0,0 +1,73 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_CHANNEL_MISSING, PNERR_PUSH_DEVICE_MISSING, PNERROR_PUSH_TYPE_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.push import PNPushAddChannelResult +from pubnub import utils + + +class AddChannelsToPush(Endpoint): + # v1/push/sub-key/{subKey}/devices/{pushToken} + ADD_PATH = "v1/push/sub-key/%s/devices/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = None + self._device_id = None + self._push_type = None + + def channels(self, channels): + self._channels = channels + return self + + def device_id(self, device_id): + self._device_id = device_id + return self + + def push_type(self, push_type): + self._push_type = push_type + return self + + def build_params(self): + params = self.default_params() + + params['add'] = utils.join_items(self._channels) + params['type'] = utils.push_type_to_string(self._push_type) + + return params + + def build_path(self): + return AddChannelsToPush.ADD_PATH % ( + self.pubnub.config.subscribe_key, self._device_id) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if not isinstance(self._channels, list) or len(self._channels) == 0: + raise PubNubException(pn_error=PNERR_CHANNEL_MISSING) + + if not isinstance(self._device_id, six.string_types) or len(self._device_id) == 0: + raise PubNubException(pn_error=PNERR_PUSH_DEVICE_MISSING) + + if self._push_type is None or len(self._push_type) == 0: + raise PubNubException(pn_error=PNERROR_PUSH_TYPE_MISSING) + + def create_response(self, envelope): + return PNPushAddChannelResult() + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNAddPushNotificationsOnChannelsOperation + + def name(self): + return "AddChannelsToPush" diff --git a/pubnub/endpoints/push/remove_channels_from_push.py b/pubnub/endpoints/push/remove_channels_from_push.py new file mode 100644 index 00000000..3b14b7d8 --- /dev/null +++ b/pubnub/endpoints/push/remove_channels_from_push.py @@ -0,0 +1,73 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_CHANNEL_MISSING, PNERR_PUSH_DEVICE_MISSING, PNERROR_PUSH_TYPE_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.push import PNPushRemoveChannelResult +from pubnub import utils + + +class RemoveChannelsFromPush(Endpoint): + # v1/push/sub-key/{subKey}/devices/{pushToken} + REMOVE_PATH = "v1/push/sub-key/%s/devices/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channels = None + self._device_id = None + self._push_type = None + + def channels(self, channels): + self._channels = channels + return self + + def device_id(self, device_id): + self._device_id = device_id + return self + + def push_type(self, push_type): + self._push_type = push_type + return self + + def build_params(self): + params = self.default_params() + + params['remove'] = utils.join_items(self._channels) + params['type'] = utils.push_type_to_string(self._push_type) + + return params + + def build_path(self): + return RemoveChannelsFromPush.REMOVE_PATH % ( + self.pubnub.config.subscribe_key, self._device_id) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if not isinstance(self._channels, list) or len(self._channels) == 0: + raise PubNubException(pn_error=PNERR_CHANNEL_MISSING) + + if not isinstance(self._device_id, six.string_types) or len(self._device_id) == 0: + raise PubNubException(pn_error=PNERR_PUSH_DEVICE_MISSING) + + if self._push_type is None or len(self._push_type) == 0: + raise PubNubException(pn_error=PNERROR_PUSH_TYPE_MISSING) + + def create_response(self, envelope): + return PNPushRemoveChannelResult() + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNRemovePushNotificationsFromChannelsOperation + + def name(self): + return "RemoveChannelsFromPush" diff --git a/pubnub/enums.py b/pubnub/enums.py index 90b75275..486de1a2 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -64,3 +64,8 @@ class PNHeartbeatNotificationOptions(object): class PNReconnectionPolicy(object): NONE = 1 LINEAR = 2 + +class PNPushType(object): + APNS = 1 + MPNS = 2 + GCM = 3 diff --git a/pubnub/errors.py b/pubnub/errors.py index 78eb40e9..12b311c2 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -22,3 +22,5 @@ PNERR_CHANNEL_OR_GROUP_MISSING = "Channel or group missing" PNERR_STATE_MISSING = "State missing or not a dict" PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET = "State setter for channel groups is not supported yet" +PNERR_PUSH_DEVICE_MISSING = "Device ID is missing for push operation" +PNERROR_PUSH_TYPE_MISSING = "Push Type is missing" diff --git a/pubnub/models/consumer/push.py b/pubnub/models/consumer/push.py new file mode 100644 index 00000000..65b77821 --- /dev/null +++ b/pubnub/models/consumer/push.py @@ -0,0 +1,6 @@ + +class PNPushAddChannelResult(object): + pass + +class PNPushRemoveChannelResult(object): + pass diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 0da9a27a..ea14a395 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -13,6 +13,8 @@ from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow +from .endpoints.push.remove_channels_from_push import RemoveChannelsFromPush + logger = logging.getLogger("pubnub") @@ -83,4 +85,8 @@ def here_now(self): return HereNow(self) def publish(self): - return Publish(self, self._publish_sequence_manager) \ No newline at end of file + return Publish(self, self._publish_sequence_manager) + + # Push Related methods + def remove_channels_from_push(self): + return RemoveChannelsFromPush(self); diff --git a/pubnub/utils.py b/pubnub/utils.py index 8eca59ea..bc036df9 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -4,7 +4,7 @@ import six -from .enums import PNStatusCategory, PNOperationType +from .enums import PNStatusCategory, PNOperationType, PNPushType from .models.consumer.common import PNStatus from .errors import PNERR_JSON_NOT_SERIALIZABLE from .exceptions import PubNubException @@ -126,5 +126,15 @@ def is_unsubscribed_event(status): and status.operation == PNOperationType.PNUnsubscribeOperation +def push_type_to_string(push_type): + if push_type == PNPushType.APNS: + return "apns" + elif push_type == PNPushType.GCM: + return "gcm" + elif push_type == PNPushType.MPNS: + return "mpns" + else: + return "" + urlparse = pn_urlparse parse_qs = pn_parse_qs diff --git a/tests/functional/push/__init__.py b/tests/functional/push/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/functional/push/test_add_channels_to_push.py b/tests/functional/push/test_add_channels_to_push.py new file mode 100644 index 00000000..acc45017 --- /dev/null +++ b/tests/functional/push/test_add_channels_to_push.py @@ -0,0 +1,71 @@ +import unittest + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub + +import pubnub.enums + +from pubnub.endpoints.push.add_channels_to_push import AddChannelsToPush +from tests.helper import pnconf, sdk_name + + +class TestAddChannelsFromPush(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + + self.pubnub.uuid = "UUID_AddChannelsTest" + self.add_channels = AddChannelsToPush(self.pubnub) + + def test_push_add_single_channel(self): + self.add_channels.channels(['ch']).push_type(pubnub.enums.PNPushType.APNS).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params) + + self.assertEqual(self.add_channels.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'apns', + 'add': 'ch' + }) + + self.assertEqual(self.add_channels._channels, ['ch']) + + def test_push_add_multiple_channels(self): + self.add_channels.channels(['ch1', 'ch2']).push_type(pubnub.enums.PNPushType.MPNS).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params) + + self.assertEqual(self.add_channels.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'mpns', + 'add': 'ch1,ch2' + }) + + self.assertEqual(self.add_channels._channels, ['ch1', 'ch2']) + + def test_push_add_google(self): + self.add_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.GCM).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params) + + self.assertEqual(self.add_channels.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'gcm', + 'add': 'ch1,ch2,ch3' + }) + + self.assertEqual(self.add_channels._channels, ['ch1', 'ch2', 'ch3']) diff --git a/tests/functional/push/test_remove_channels_from_push.py b/tests/functional/push/test_remove_channels_from_push.py new file mode 100644 index 00000000..64f851ab --- /dev/null +++ b/tests/functional/push/test_remove_channels_from_push.py @@ -0,0 +1,71 @@ +import unittest + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub + +import pubnub.enums + +from pubnub.endpoints.push.remove_channels_from_push import RemoveChannelsFromPush +from tests.helper import pnconf, sdk_name + + +class TestRemoveChannelsFromPush(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + + self.pubnub.uuid = "UUID_RemoveChannelsTest" + self.remove_channels = RemoveChannelsFromPush(self.pubnub) + + def test_push_remove_single_channel(self): + self.remove_channels.channels(['ch']).push_type(pubnub.enums.PNPushType.APNS).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) + + self.assertEqual(self.remove_channels.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'apns', + 'remove': 'ch' + }) + + self.assertEqual(self.remove_channels._channels, ['ch']) + + def test_push_remove_multiple_channels(self): + self.remove_channels.channels(['ch1', 'ch2']).push_type(pubnub.enums.PNPushType.MPNS).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) + + self.assertEqual(self.remove_channels.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'mpns', + 'remove': 'ch1,ch2' + }) + + self.assertEqual(self.remove_channels._channels, ['ch1', 'ch2']) + + def test_push_remove_google(self): + self.remove_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.GCM).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) + + self.assertEqual(self.remove_channels.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'gcm', + 'remove': 'ch1,ch2,ch3' + }) + + self.assertEqual(self.remove_channels._channels, ['ch1', 'ch2', 'ch3']) From d414f8950fee855482043f8fd33dc83759111bd8 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Sat, 9 Jul 2016 22:44:02 -0700 Subject: [PATCH 182/468] list, remove push --- pubnub/endpoints/push/list_push_provisions.py | 67 +++++++++++++++++++ pubnub/endpoints/push/remove_device.py | 64 ++++++++++++++++++ pubnub/models/consumer/push.py | 9 +++ pubnub/pubnub_core.py | 16 ++++- .../push/test_list_push_provisions.py | 64 ++++++++++++++++++ .../push/test_remove_device_from_push.py | 62 +++++++++++++++++ 6 files changed, 280 insertions(+), 2 deletions(-) create mode 100644 pubnub/endpoints/push/list_push_provisions.py create mode 100644 pubnub/endpoints/push/remove_device.py create mode 100644 tests/functional/push/test_list_push_provisions.py create mode 100644 tests/functional/push/test_remove_device_from_push.py diff --git a/pubnub/endpoints/push/list_push_provisions.py b/pubnub/endpoints/push/list_push_provisions.py new file mode 100644 index 00000000..768847fd --- /dev/null +++ b/pubnub/endpoints/push/list_push_provisions.py @@ -0,0 +1,67 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_PUSH_DEVICE_MISSING, PNERROR_PUSH_TYPE_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.push import PNPushListProvisionsResult +from pubnub import utils + + +class ListPushProvisions(Endpoint): + # v1/push/sub-key/{subKey}/devices/{pushToken} + LIST_PATH = "v1/push/sub-key/%s/devices/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._device_id = None + self._push_type = None + + def device_id(self, device_id): + self._device_id = device_id + return self + + def push_type(self, push_type): + self._push_type = push_type + return self + + def build_params(self): + params = self.default_params() + + params['type'] = utils.push_type_to_string(self._push_type) + + return params + + def build_path(self): + return ListPushProvisions.LIST_PATH % ( + self.pubnub.config.subscribe_key, self._device_id) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if not isinstance(self._device_id, six.string_types) or len(self._device_id) == 0: + raise PubNubException(pn_error=PNERR_PUSH_DEVICE_MISSING) + + if self._push_type is None or len(self._push_type) == 0: + raise PubNubException(pn_error=PNERROR_PUSH_TYPE_MISSING) + + def create_response(self, envelope): + if envelope is not None and isinstance(envelope, list): + return PNPushListProvisionsResult(envelope['payload']['channels']) + else: + return PNPushListProvisionsResult([]) + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNPushNotificationEnabledChannelsOperation + + def name(self): + return "ListPushProvisions" diff --git a/pubnub/endpoints/push/remove_device.py b/pubnub/endpoints/push/remove_device.py new file mode 100644 index 00000000..05c8898b --- /dev/null +++ b/pubnub/endpoints/push/remove_device.py @@ -0,0 +1,64 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_PUSH_DEVICE_MISSING, PNERROR_PUSH_TYPE_MISSING +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.push import PNPushRemoveAllChannelsResult +from pubnub import utils + + +class RemoveDeviceFromPush(Endpoint): + # v1/push/sub-key/{subKey}/devices/{pushToken}/remove + REMOVE_PATH = "v1/push/sub-key/%s/devices/%s/remove" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._device_id = None + self._push_type = None + + def device_id(self, device_id): + self._device_id = device_id + return self + + def push_type(self, push_type): + self._push_type = push_type + return self + + def build_params(self): + params = self.default_params() + + params['type'] = utils.push_type_to_string(self._push_type) + + return params + + def build_path(self): + return RemoveDeviceFromPush.REMOVE_PATH % ( + self.pubnub.config.subscribe_key, self._device_id) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if not isinstance(self._device_id, six.string_types) or len(self._device_id) == 0: + raise PubNubException(pn_error=PNERR_PUSH_DEVICE_MISSING) + + if self._push_type is None or len(self._push_type) == 0: + raise PubNubException(pn_error=PNERROR_PUSH_TYPE_MISSING) + + def create_response(self, envelope): + return PNPushRemoveAllChannelsResult() + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNRemoveAllPushNotificationsOperation + + def name(self): + return "RemoveDeviceFromPush" diff --git a/pubnub/models/consumer/push.py b/pubnub/models/consumer/push.py index 65b77821..da304934 100644 --- a/pubnub/models/consumer/push.py +++ b/pubnub/models/consumer/push.py @@ -2,5 +2,14 @@ class PNPushAddChannelResult(object): pass + class PNPushRemoveChannelResult(object): pass + + +class PNPushRemoveAllChannelsResult(object): + pass + +class PNPushListProvisionsResult(object): + def __init__(self, channels): + self.channels = channels diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index ea14a395..52837d5e 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -13,8 +13,10 @@ from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow +from .endpoints.push.add_channels_to_push import AddChannelsToPush from .endpoints.push.remove_channels_from_push import RemoveChannelsFromPush - +from .endpoints.push.remove_device import RemoveDeviceFromPush +from .endpoints.push.list_push_provisions import ListPushProvisions logger = logging.getLogger("pubnub") @@ -88,5 +90,15 @@ def publish(self): return Publish(self, self._publish_sequence_manager) # Push Related methods + + def list_push_channels(self): + return ListPushProvisions(self) + + def add_channels_to_push(self): + return AddChannelsToPush(self) + def remove_channels_from_push(self): - return RemoveChannelsFromPush(self); + return RemoveChannelsFromPush(self) + + def remove_device_from_push(self): + return RemoveDeviceFromPush(self) diff --git a/tests/functional/push/test_list_push_provisions.py b/tests/functional/push/test_list_push_provisions.py new file mode 100644 index 00000000..c39c9bd0 --- /dev/null +++ b/tests/functional/push/test_list_push_provisions.py @@ -0,0 +1,64 @@ +import unittest + +from pubnub.endpoints.push.list_push_provisions import ListPushProvisions +from pubnub.enums import PNPushType + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestListPushProvisions(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + self.pubnub.uuid = "UUID_ListChannelsInCGTest" + self.list_push = ListPushProvisions(self.pubnub) + + def test_list_channel_group_apns(self): + self.list_push.push_type(PNPushType.APNS).device_id('coolDevice') + + self.assertEquals(self.list_push.build_path(), + ListPushProvisions.LIST_PATH % ( + pnconf.subscribe_key, "coolDevice")) + + self.assertEqual(self.list_push.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'apns' + }) + + + def test_list_channel_group_gcm(self): + self.list_push.push_type(PNPushType.GCM).device_id('coolDevice') + + self.assertEquals(self.list_push.build_path(), + ListPushProvisions.LIST_PATH % ( + pnconf.subscribe_key, "coolDevice")) + + self.assertEqual(self.list_push.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'gcm' + }) + + def test_list_channel_group_mpns(self): + self.list_push.push_type(PNPushType.MPNS).device_id('coolDevice') + + self.assertEquals(self.list_push.build_path(), + ListPushProvisions.LIST_PATH % ( + pnconf.subscribe_key, "coolDevice")) + + self.assertEqual(self.list_push.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'mpns' + }) diff --git a/tests/functional/push/test_remove_device_from_push.py b/tests/functional/push/test_remove_device_from_push.py new file mode 100644 index 00000000..883f6cc6 --- /dev/null +++ b/tests/functional/push/test_remove_device_from_push.py @@ -0,0 +1,62 @@ +import unittest + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub + +import pubnub.enums + +from pubnub.endpoints.push.remove_device import RemoveDeviceFromPush +from tests.helper import pnconf, sdk_name + + +class TestRemoveDeviceFromPush(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name, + uuid=None + ) + + self.pubnub.uuid = "UUID_RemoveDeviceTest" + self.remove_device = RemoveDeviceFromPush(self.pubnub) + + def test_remove_push_apns(self): + self.remove_device.push_type(pubnub.enums.PNPushType.APNS).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params) + + self.assertEqual(self.remove_device.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'apns', + }) + + def test_remove_push_gcm(self): + self.remove_device.push_type(pubnub.enums.PNPushType.GCM).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params) + + self.assertEqual(self.remove_device.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'gcm', + }) + + def test_remove_push_mpns(self): + self.remove_device.push_type(pubnub.enums.PNPushType.MPNS).device_id("coolDevice") + + params = (pnconf.subscribe_key, "coolDevice") + self.assertEquals(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params) + + self.assertEqual(self.remove_device.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'type': 'mpns', + }) From 4bbe2ad9c125fb16b792b9067930aac40219d088 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 11 Jul 2016 17:57:10 -0700 Subject: [PATCH 183/468] increase pool size and reduce scope of crypto --- pubnub.py | 12 ++++++------ setup.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pubnub.py b/pubnub.py index 1e97f0eb..af20f8b3 100755 --- a/pubnub.py +++ b/pubnub.py @@ -22,7 +22,7 @@ import sys import time import uuid as uuid_lib -from Crypto.Cipher import AES +from Cryptodome.Cipher import AES from base64 import encodestring, decodestring from base64 import urlsafe_b64encode @@ -30,7 +30,7 @@ from hashlib import sha256 digestmod = sha256 except ImportError: - import Crypto.Hash.SHA256 as digestmod + import Cryptodome.Hash.SHA256 as digestmod sha256 = digestmod.new @@ -2662,11 +2662,11 @@ def __init__( self.daemon = daemon if azure is False: - s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) - s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) + s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) else: - s.mount('http://', PubnubHTTPAdapter(max_retries=1)) - s.mount('https://', PubnubHTTPAdapter(max_retries=1)) + s.mount('http://', PubnubHTTPAdapter(max_retries=1, pool_maxsize=500)) + s.mount('https://', PubnubHTTPAdapter(max_retries=1, pool_maxsize=500)) def timeout(self, interval, func1, *argv): timer = Timer(interval, func1, False, *argv) diff --git a/setup.py b/setup.py index ae648908..6aed7604 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,7 @@ 'Topic :: Software Development :: Libraries :: Python Modules', ), install_requires=[ - 'pycryptodome>=3.3', + 'pycryptodomex>=3.3', 'requests>=2.4' ], zip_safe=False, From 4c961d4595d00186daf3500371c9482fb3f5c3a1 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 11 Jul 2016 19:57:59 -0700 Subject: [PATCH 184/468] version bump --- VERSION | 2 +- pubnub.py | 4 ++-- setup.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index f2807196..a08ffae0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.1 +3.8.2 diff --git a/pubnub.py b/pubnub.py index af20f8b3..0e28b096 100755 --- a/pubnub.py +++ b/pubnub.py @@ -6,7 +6,7 @@ # http://www.pubnub.com/ # ----------------------------------- -# PubNub 3.8.1 Real-time Push Cloud API +# PubNub 3.8.2 Real-time Push Cloud API # ----------------------------------- @@ -305,7 +305,7 @@ def __init__( """ self.origin = origin - self.version = '3.8.1' + self.version = '3.8.2' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key diff --git a/setup.py b/setup.py index 6aed7604..507c7ebf 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='3.8.1', + version='3.8.2', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 314160010e3664167f8a14b78bf7fe196d5115a8 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 11 Jul 2016 20:18:39 -0700 Subject: [PATCH 185/468] changelog --- CHANGELOG | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7d377938..1d35d161 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,7 @@ +3.8.2 +. Increasing maximum pool of connections and adjusting cryptodome package dependency. + 3.8.1 . Fixing bug with state setting and subscribe confirmation. From d72a818609bacd03a603a50b2636964216a15fd1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 11 Jul 2016 02:24:48 -0700 Subject: [PATCH 186/468] Add a heartbeat test --- pubnub/managers.py | 4 +- pubnub/pubnub.py | 96 +++++++++++++++++-- .../native_threads/test_heartbeat.py | 77 +++++++++++++++ 3 files changed, 167 insertions(+), 10 deletions(-) create mode 100644 tests/integrational/native_threads/test_heartbeat.py diff --git a/pubnub/managers.py b/pubnub/managers.py index 2ca6e850..6b26779d 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -208,8 +208,8 @@ def reconnect(self): def stop(self): self._should_stop = True self._stop_subscribe_loop() - self._set_consumer_event() self._stop_heartbeat_timer() + self._set_consumer_event() def _handle_endpoint_call(self, raw_result, status): assert isinstance(status, PNStatus) @@ -239,6 +239,6 @@ def _handle_endpoint_call(self, raw_result, status): self._timetoken = int(result.metadata.timetoken) self._region = int(result.metadata.region) - # TODO: implement + # TODO: make abstract def _register_heartbeat_timer(self): self._stop_heartbeat_timer() diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 27ad21cd..8ee81b56 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -6,6 +6,8 @@ # noinspection PyUnresolvedReferences from six.moves.queue import Queue from threading import Event + +from pubnub.endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe from .workers import SubscribeMessageWorker @@ -13,7 +15,7 @@ from .managers import SubscriptionManager, PublishSequenceManager from . import utils from .structures import RequestOptions, ResponseInfo -from .enums import PNStatusCategory +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions from .callbacks import SubscribeCallback from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, \ PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR @@ -246,10 +248,10 @@ def __init__(self, pubnub, success, error, options, cancellation_event): def run(self): try: res = self.pubnub.pn_request( - self.pubnub.session, self.pubnub.config.scheme_and_host(), - self.pubnub.headers, self.options, - self.pubnub.config.connect_timeout, - self.pubnub.config.non_subscribe_request_timeout) + self.pubnub.session, self.pubnub.config.scheme_and_host(), + self.pubnub.headers, self.options, + self.pubnub.config.connect_timeout, + self.pubnub.config.non_subscribe_request_timeout) if self.cancellation_event is not None and self.cancellation_event.isSet(): # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call @@ -270,6 +272,7 @@ class Call(object): """ A platform dependent representation of async PubNub method call """ + def __init__(self): self.thread = None self.cancellation_event = None @@ -299,6 +302,7 @@ def __init__(self, pubnub_instance): self._message_queue = utils.Queue() self._consumer_event = threading.Event() self._subscribe_call = None + self._heartbeat_periodic_callback = None super(NativeSubscriptionManager, self).__init__(pubnub_instance) def _send_leave(self, unsubscribe_operation): @@ -309,14 +313,56 @@ def leave_callback(result, status): .channels(unsubscribe_operation.channels) \ .channel_groups(unsubscribe_operation.channel_groups).async(leave_callback) + def _register_heartbeat_timer(self): + super(NativeSubscriptionManager, self)._register_heartbeat_timer() + + self._perform_heartbeat_loop() + + self._heartbeat_periodic_callback = NativePeriodicCallback( + self._perform_heartbeat_loop, + self._pubnub.config.heartbeat_interval * 1000) + + if not self._should_stop: + self._heartbeat_periodic_callback.start() + def _perform_heartbeat_loop(self): - pass + if self._heartbeat_call is not None: + # TODO: cancel call + pass + + state_payload = self._subscription_state.state_payload() + presence_channels = self._subscription_state.prepare_channel_list(False) + presence_groups = self._subscription_state.prepare_channel_group_list(False) + + if len(presence_channels) == 0 and len(presence_groups) == 0: + return + + def heartbeat_callback(raw_result, status): + heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options + if status.is_error: + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + self._listener_manager.announce_stateus(status) + else: + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + self._listener_manager.announce_stateus(status) + + try: + (Heartbeat(self._pubnub) + .channels(presence_channels) + .channel_groups(presence_groups) + .state(state_payload) + .async(heartbeat_callback)) + except Exception as e: + print("failed", e) def _stop_heartbeat_timer(self): - pass + if self._heartbeat_periodic_callback is not None: + self._heartbeat_periodic_callback.stop() def _set_consumer_event(self): self._consumer_event.set() + self._message_queue_put(None) def _message_queue_put(self, message): self._message_queue.put(message) @@ -328,7 +374,7 @@ def reconnect(self): def _start_worker(self): consumer = NativeSubscribeMessageWorker(self._pubnub, self._listener_manager, - self._message_queue, self._consumer_event) + self._message_queue, self._consumer_event) self._consumer_thread = threading.Thread(target=consumer.run, name="SubscribeMessageWorker") self._consumer_thread.start() @@ -354,6 +400,7 @@ def callback(raw_result, status): self._handle_endpoint_call(raw_result, status) self._start_subscribe_loop() + try: self._subscribe_call = Subscribe(self._pubnub) \ .channels(combined_channels).channel_groups(combined_groups) \ @@ -370,6 +417,39 @@ def _stop_subscribe_loop(self): sc.cancel() +class NativePeriodicCallback(object): + def __init__(self, callback, callback_time): + self._callback = callback + self._callback_time = callback_time + self._running = False + self._timeout = None + + def start(self): + self._running = True + self._schedule_next() + + def stop(self): + self._running = False + if self._timeout is not None: + self._timeout.cancel() + self._timeout = None + + def _run(self): + if not self._running: + return + try: + self._callback() + except Exception: + # TODO: handle the exception + pass + finally: + self._schedule_next() + + def _schedule_next(self): + self._timeout = threading.Timer(10.0, self._run) + self._timeout.start() + + class NativeSubscribeMessageWorker(SubscribeMessageWorker): def _take_message(self): while not self._event.isSet(): diff --git a/tests/integrational/native_threads/test_heartbeat.py b/tests/integrational/native_threads/test_heartbeat.py new file mode 100644 index 00000000..2c8ef2c1 --- /dev/null +++ b/tests/integrational/native_threads/test_heartbeat.py @@ -0,0 +1,77 @@ +import logging +import unittest +import time +import pubnub as pn + +from pubnub.pubnub import PubNub, SubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +messenger_config = pnconf_sub_copy() +messenger_config.set_presence_timeout(8) +messenger_config.uuid = helper.gen_channel("messenger") + +listener_config = pnconf_sub_copy() +listener_config.uuid = helper.gen_channel("listener") + + +class TestPubNubHeartbeat(unittest.TestCase): + def test_blah(self): + assert 'qwer' == 'sdfg' + + def test_timeout_event_on_broken_heartbeat(self): + ch = helper.gen_channel("heartbeat-test") + + pubnub = PubNub(messenger_config) + pubnub_listener = PubNub(listener_config) + + pubnub.config.uuid = helper.gen_channel("messenger") + pubnub_listener.config.uuid = helper.gen_channel("listener") + + callback_presence = SubscribeListener() + callback_messages = SubscribeListener() + + # - connect to :ch-pnpres + pubnub_listener.add_listener(callback_presence) + pubnub_listener.subscribe().channels(ch).with_presence().execute() + callback_presence.wait_for_connect() + + presence_message = callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == presence_message.actual_channel + assert 'join' == presence_message.event + assert pubnub_listener.uuid == presence_message.uuid + + # - connect to :ch + pubnub.add_listener(callback_messages) + pubnub.subscribe().channels(ch).execute() + callback_messages.wait_for_connect() + + prs_envelope = callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == prs_envelope.actual_channel + assert 'join' == prs_envelope.event + assert pubnub.uuid == prs_envelope.uuid + + # wait for one heartbeat call + time.sleep(8) + + # - break messenger heartbeat loop + # pubnub._subscription_manager._stop_heartbeat_timer() + + # - assert for timeout + presence_message = callback_presence.wait_for_presence_on(ch) + assert ch + "-pnpres" == presence_message.actual_channel + assert 'timeout' == presence_message.event + assert pubnub.uuid == presence_message.uuid + + pubnub.unsubscribe().channels(ch).execute() + callback_messages.wait_for_disconnect() + + # - disconnect from :ch-pnpres + pubnub_listener.unsubscribe().channels(ch).execute() + callback_presence.wait_for_disconnect() + + pubnub.stop() + pubnub_listener.stop() From b6c4b041b1981e10ce304fc0e3d99eea0a4bd0fd Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 11 Jul 2016 06:02:36 -0700 Subject: [PATCH 187/468] Fix Native heartbeat --- pubnub/pubnub.py | 16 ++++++---------- .../native_threads/test_heartbeat.py | 6 ++++-- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 8ee81b56..21f2e75a 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -46,9 +46,7 @@ def request_sync(self, options): res = self.pn_request(self.session, self.config.scheme_and_host(), self.headers, - options, - self.config.connect_timeout, - self.config.non_subscribe_request_timeout) + options) # http error if res.status_code != requests.codes.ok: @@ -172,7 +170,7 @@ def add_listener(self, listener): assert isinstance(listener, SubscribeCallback) self._subscription_manager.add_listener(listener) - def pn_request(self, session, scheme_and_host, headers, options, connect_timeout, read_timeout): + def pn_request(self, session, scheme_and_host, headers, options): assert isinstance(options, RequestOptions) url = scheme_and_host + options.path @@ -181,7 +179,7 @@ def pn_request(self, session, scheme_and_host, headers, options, connect_timeout 'headers': headers, "url": url, 'params': options.query_string, - 'timeout': (connect_timeout, read_timeout) + 'timeout': (options.connect_timeout, options.request_timeout) } if options.is_post(): @@ -249,9 +247,7 @@ def run(self): try: res = self.pubnub.pn_request( self.pubnub.session, self.pubnub.config.scheme_and_host(), - self.pubnub.headers, self.options, - self.pubnub.config.connect_timeout, - self.pubnub.config.non_subscribe_request_timeout) + self.pubnub.headers, self.options) if self.cancellation_event is not None and self.cancellation_event.isSet(): # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call @@ -320,7 +316,7 @@ def _register_heartbeat_timer(self): self._heartbeat_periodic_callback = NativePeriodicCallback( self._perform_heartbeat_loop, - self._pubnub.config.heartbeat_interval * 1000) + self._pubnub.config.heartbeat_interval) if not self._should_stop: self._heartbeat_periodic_callback.start() @@ -446,7 +442,7 @@ def _run(self): self._schedule_next() def _schedule_next(self): - self._timeout = threading.Timer(10.0, self._run) + self._timeout = threading.Timer(self._callback_time, self._run) self._timeout.start() diff --git a/tests/integrational/native_threads/test_heartbeat.py b/tests/integrational/native_threads/test_heartbeat.py index 2c8ef2c1..ef7a49a0 100644 --- a/tests/integrational/native_threads/test_heartbeat.py +++ b/tests/integrational/native_threads/test_heartbeat.py @@ -10,6 +10,8 @@ pn.set_stream_logger('pubnub', logging.DEBUG) +# TODO: add a success heartbeat test + messenger_config = pnconf_sub_copy() messenger_config.set_presence_timeout(8) messenger_config.uuid = helper.gen_channel("messenger") @@ -55,10 +57,10 @@ def test_timeout_event_on_broken_heartbeat(self): assert pubnub.uuid == prs_envelope.uuid # wait for one heartbeat call - time.sleep(8) + time.sleep(6) # - break messenger heartbeat loop - # pubnub._subscription_manager._stop_heartbeat_timer() + pubnub._subscription_manager._stop_heartbeat_timer() # - assert for timeout presence_message = callback_presence.wait_for_presence_on(ch) From c39fa0f8126727a3cf27b4c7d35806c971d4216e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 14 Jul 2016 13:38:37 -0700 Subject: [PATCH 188/468] Add PAM methods without CG support --- pubnub/endpoints/access/__init__.py | 0 pubnub/endpoints/access/audit.py | 95 +++++++++++++ pubnub/endpoints/access/grant.py | 121 ++++++++++++++++ pubnub/endpoints/endpoint.py | 29 ++-- pubnub/errors.py | 2 + pubnub/models/consumer/access_manager.py | 116 +++++++++++++++ pubnub/pnconfiguration.py | 1 + pubnub/pubnub_asyncio.py | 2 +- pubnub/pubnub_core.py | 14 +- pubnub/structures.py | 21 ++- pubnub/utils.py | 83 ++++++++--- tests/functional/test_grant.py | 50 +++++++ tests/helper.py | 14 ++ tests/integrational/asyncio/test_pam.py | 171 +++++++++++++++++++++++ tests/unit/test_utils.py | 25 ++++ 15 files changed, 703 insertions(+), 41 deletions(-) create mode 100644 pubnub/endpoints/access/__init__.py create mode 100644 pubnub/endpoints/access/audit.py create mode 100644 pubnub/endpoints/access/grant.py create mode 100644 pubnub/models/consumer/access_manager.py create mode 100644 tests/functional/test_grant.py create mode 100644 tests/integrational/asyncio/test_pam.py diff --git a/pubnub/endpoints/access/__init__.py b/pubnub/endpoints/access/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pubnub/endpoints/access/audit.py b/pubnub/endpoints/access/audit.py new file mode 100644 index 00000000..1b196dc9 --- /dev/null +++ b/pubnub/endpoints/access/audit.py @@ -0,0 +1,95 @@ +import copy + +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_PAM_NO_FLAGS +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.access_manager import PNAccessManagerGrantResult, PNAccessManagerAuditResult + + +class Audit(Endpoint): + AUDIT_PATH = "/v1/auth/audit/sub-key/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._auth_keys = [] + self._channels = [] + self._groups = [] + self._read = None + self._write = None + self._manage = None + self._ttl = None + + self._sort_params = True + + def auth_keys(self, auth_keys): + utils.extend_list(self._auth_keys, auth_keys) + return self + + def channels(self, channels): + utils.extend_list(self._channels, channels) + return self + + def channel_groups(self, channel_groups): + utils.extend_list(self._groups, channel_groups) + return self + + def build_params(self): + params = self.default_params() + + signed_input = (self.pubnub.config.subscribe_key + "\n" + + self.pubnub.config.publish_key + "\naudit\n") + + if len(self._auth_keys) > 0: + params['auth'] = utils.join_items_and_encode(self._auth_keys) + + if len(self._channels) > 0: + params['channel'] = utils.join_items_and_encode(self._channels) + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items_and_encode(self._groups) + + params['timestamp'] = str(self.pubnub.timestamp()) + + # The SDK version string should be signed unencoded + params_to_sign = copy.copy(params) + params_to_sign['pnsdk'] = self.pubnub.sdk_name + + signed_input += utils.prepare_pam_arguments(params_to_sign) + signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) + + params['signature'] = signature + + return params + + def build_path(self): + return Audit.AUDIT_PATH % self.pubnub.config.subscribe_key + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + self.validate_secret_key() + + def create_response(self, envelope): + return PNAccessManagerAuditResult.from_json(envelope['payload']) + + def affected_channels(self): + return self._channels + + def affected_channels_groups(self): + return self._groups + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNAccessManagerGrant + + def name(self): + return "Grant" diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py new file mode 100644 index 00000000..21c78f29 --- /dev/null +++ b/pubnub/endpoints/access/grant.py @@ -0,0 +1,121 @@ +import copy + +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.errors import PNERR_PAM_NO_FLAGS +from pubnub.exceptions import PubNubException +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.access_manager import PNAccessManagerGrantResult + + +class Grant(Endpoint): + GRANT_PATH = "/v1/auth/grant/sub-key/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._auth_keys = [] + self._channels = [] + self._groups = [] + self._read = None + self._write = None + self._manage = None + self._ttl = None + + self._sort_params = True + + def auth_keys(self, auth_keys): + utils.extend_list(self._auth_keys, auth_keys) + return self + + def channels(self, channels): + utils.extend_list(self._channels, channels) + return self + + def channel_groups(self, channel_groups): + utils.extend_list(self._groups, channel_groups) + return self + + def read(self, flag): + self._read = flag + return self + + def write(self, flag): + self._write = flag + return self + + def manage(self, flag): + self._manage = flag + return self + + def build_params(self): + params = self.default_params() + + signed_input = (self.pubnub.config.subscribe_key + "\n" + + self.pubnub.config.publish_key + "\ngrant\n") + + if self._read is not None: + params['r'] = '1' if self._read is True else '0' + if self._write is not None: + params['w'] = '1' if self._write is True else '0' + if self._manage is not None: + params['m'] = '1' if self._manage is True else '0' + + if len(self._auth_keys) > 0: + params['auth'] = utils.join_items_and_encode(self._auth_keys) + + if len(self._channels) > 0: + params['channel'] = utils.join_items_and_encode(self._channels) + + if len(self._groups) > 0: + params['channel-group'] = utils.join_items_and_encode(self._groups) + + if self._ttl is not None: + params['ttl'] = int(self._ttl) + + params['timestamp'] = str(self.pubnub.timestamp()) + + # The SDK version string should be signed unencoded + params_to_sign = copy.copy(params) + params_to_sign['pnsdk'] = self.pubnub.sdk_name + + signed_input += utils.prepare_pam_arguments(params_to_sign) + signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) + + params['signature'] = signature + + return params + + def build_path(self): + return Grant.GRANT_PATH % self.pubnub.config.subscribe_key + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + self.validate_secret_key() + # self.validate_channels_and_groups() + + if self._write is None and self._read is None and self._manage is None: + raise PubNubException(pn_error=PNERR_PAM_NO_FLAGS) + + def create_response(self, envelope): + return PNAccessManagerGrantResult.from_json(envelope['payload']) + + def affected_channels(self): + return self._channels + + def affected_channels_groups(self): + return self._groups + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNAccessManagerGrant + + def name(self): + return "Grant" diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index f5e88a20..923365fa 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,7 +1,9 @@ from abc import ABCMeta, abstractmethod +from pubnub import utils from pubnub.enums import PNStatusCategory -from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING +from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING, \ + PNERR_SECRET_KEY_MISSING from pubnub.exceptions import PubNubException from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pn_error_data import PNErrorData @@ -18,6 +20,7 @@ class Endpoint(object): def __init__(self, pubnub): self.pubnub = pubnub self._cancellation_event = None + self._sort_params = False def cancellation_event(self, event): self._cancellation_event = event @@ -71,7 +74,7 @@ def affected_channels_groups(self): def options(self): return RequestOptions(self.build_path(), self.build_params(), self.http_method(), self.request_timeout(), - self.connect_timeout(), self.build_data()) + self.connect_timeout(), self.build_data(), self._sort_params) def sync(self): self.validate_params() @@ -119,7 +122,7 @@ def handler(): def default_params(self): return { - 'pnsdk': self.pubnub.sdk_name, + 'pnsdk': utils.url_encode(self.pubnub.sdk_name), 'uuid': self.pubnub.uuid } @@ -127,6 +130,10 @@ def validate_subscribe_key(self): if self.pubnub.config.subscribe_key is None or len(self.pubnub.config.subscribe_key) == 0: raise PubNubException(pn_error=PNERR_SUBSCRIBE_KEY_MISSING) + def validate_secret_key(self): + if self.pubnub.config.secret_key is None or len(self.pubnub.config.secret_key) == 0: + raise PubNubException(pn_error=PNERR_SECRET_KEY_MISSING) + def validate_channels_and_groups(self): if len(self._channels) == 0 and len(self._groups) == 0: raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) @@ -176,11 +183,11 @@ def create_status_response(self, category, response, response_info, exception): return pn_status # TODO: move to utils? - @classmethod - def join_query(cls, params): - query_list = [] - - for k, v in params.items(): - query_list.append(k + "=" + v) - - return "&".join(query_list) + # @classmethod + # def join_query(cls, params): + # query_list = [] + # + # for k, v in params.items(): + # query_list.append(k + "=" + v) + # + # return "&".join(query_list) diff --git a/pubnub/errors.py b/pubnub/errors.py index 12b311c2..0cd9d12f 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -14,6 +14,7 @@ PNERR_GROUP_MISSING = "Channel group missing" PNERR_MESSAGE_MISSING = "Message missing" PNERR_SUBSCRIBE_KEY_MISSING = "Subscribe key not configured" +PNERR_SECRET_KEY_MISSING = "Secret key is not configured" PNERR_PUBLISH_KEY_MISSING = "Publish key not configured" PNERR_PUBLISH_META_WRONG_TYPE = "Publish meta should be dict" PNERR_DEFERRED_NOT_IMPLEMENTED = "Deferred endpoint call is not implemented by this platform" @@ -24,3 +25,4 @@ PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET = "State setter for channel groups is not supported yet" PNERR_PUSH_DEVICE_MISSING = "Device ID is missing for push operation" PNERROR_PUSH_TYPE_MISSING = "Push Type is missing" +PNERR_PAM_NO_FLAGS = "At least one flag should be specified" diff --git a/pubnub/models/consumer/access_manager.py b/pubnub/models/consumer/access_manager.py new file mode 100644 index 00000000..5a96ee31 --- /dev/null +++ b/pubnub/models/consumer/access_manager.py @@ -0,0 +1,116 @@ +import six +""" +Possible responses of PAM request +""" + + +class _PAMResult(object): + def __init__(self, level, subscribe_key, channels, groups, ttl=None, r=None, w=None, m=None): + self.level = level + self.subscribe_key = subscribe_key + self.channels = channels + self.groups = groups + self.ttl = ttl + self.read_enabled = r + self.write_enabled = w + self.manage_enabled = m + + @classmethod + def from_json(cls, json_input): + constructed_channels = {} + constructed_groups = {} + r, w, m, ttl = fetch_permissions(json_input) + + if 'channel' in json_input: + channel_name = json_input['channel'] + constructed_auth_keys = {} + for auth_key_name, value in six.iteritems(json_input['auths']): + constructed_auth_keys[auth_key_name] = PNAccessManagerKeyData.from_json(value) + + constructed_channels[channel_name] = PNAccessManagerChannelData( + name=channel_name, + auth_keys=constructed_auth_keys, + ttl=ttl + ) + + if 'channel_groups' in json_input: + pass #TODO: implement + + if 'channels' in json_input: + for channel_name, value in six.iteritems(json_input['channels']): + constructed_channels[channel_name] = \ + PNAccessManagerChannelData.from_json(channel_name, value) + + return cls( + level=json_input['level'], + subscribe_key=json_input['subscribe_key'], + channels=constructed_channels, + groups=constructed_groups, + r=r, + w=w, + m=m, + ttl=ttl, + ) + + +class PNAccessManagerAuditResult(_PAMResult): + pass + + +class PNAccessManagerGrantResult(_PAMResult): + pass + + +class PNAccessManagerChannelData(object): + def __init__(self, name, auth_keys=None, r=None, w=None, m=None, ttl=None): + self.name = name + self.auth_keys = auth_keys + self.read_enabled = r + self.write_enabled = w + self.manage_enabled = m + self.ttl = ttl + + @classmethod + def from_json(cls, name, json_input): + r, w, m, ttl = fetch_permissions(json_input) + constructed_auth_keys = {} + + if 'auths' in json_input: + for auth_key, value in json_input['auths'].items(): + constructed_auth_keys[auth_key] = PNAccessManagerKeyData.from_json(value) + + return PNAccessManagerChannelData(name, constructed_auth_keys, r, w, m) + + +class PNAccessManagerKeyData(object): + def __init__(self, r, w, m, ttl=None): + self.read_enabled = r + self.write_enabled = w + self.manage_enabled = m + self.ttl = ttl + + @classmethod + def from_json(cls, json_input): + r, w, m, ttl = fetch_permissions(json_input) + return PNAccessManagerKeyData(r, w, m, ttl) + + +def fetch_permissions(json_input): + r = None + w = None + m = None + ttl = None + + if 'r' in json_input: + r = json_input['r'] == 1 + + if 'w' in json_input: + w = json_input['w'] == 1 + + if 'm' in json_input: + m = json_input['m'] == 1 + + if 'ttl' in json_input: + ttl = json_input['ttl'] + + return r, w, m, ttl diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 1baab7fa..f0d661c2 100755 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -16,6 +16,7 @@ def __init__(self): self.connect_timeout = 5 self.subscribe_key = None self.publish_key = None + self.secret_key = None self.cipher_key = None self.auth_key = None self.filter_expression = None diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 76398420..06431854 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -88,7 +88,7 @@ async def request_future(self, intermediate_key_future, options_func, create_res raise except Exception as e: print('regular error', str(e)) - return + raise body = await response.text() diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 52837d5e..92a641ab 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,6 +1,10 @@ import logging from abc import ABCMeta, abstractmethod +import time + +from pubnub.endpoints.access.audit import Audit +from pubnub.endpoints.access.grant import Grant from .builders import SubscribeBuilder from .builders import UnsubscribeBuilder from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup @@ -89,8 +93,13 @@ def here_now(self): def publish(self): return Publish(self, self._publish_sequence_manager) - # Push Related methods + def grant(self): + return Grant(self) + + def audit(self): + return Audit(self) + # Push Related methods def list_push_channels(self): return ListPushProvisions(self) @@ -102,3 +111,6 @@ def remove_channels_from_push(self): def remove_device_from_push(self): return RemoveDeviceFromPush(self) + + def timestamp(self): + return int(time.time()) diff --git a/pubnub/structures.py b/pubnub/structures.py index 03db13b0..5f04b875 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -1,11 +1,11 @@ import six -from . import utils from .enums import HttpMethod class RequestOptions(object): - def __init__(self, path, params, method, request_timeout, connect_timeout, data=None): + def __init__(self, path, params, method, request_timeout, connect_timeout, data=None, + sort_arguments=False): assert len(path) > 0 assert len(params) > 0 assert isinstance(method, six.integer_types) @@ -20,6 +20,7 @@ def __init__(self, path, params, method, request_timeout, connect_timeout, data= self.connect_timeout = connect_timeout # TODO: rename to 'body' self.data = data + self.sort_params = sort_arguments @property def method_string(self): @@ -28,20 +29,18 @@ def method_string(self): def is_post(self): return self._method is HttpMethod.POST - def query_list(self, do_not_encode=None): + def query_list(self): + """ All query keys and values should be already encoded inside a build_params() method""" # TODO: add option to sort params alphabetically(for PAM requests) - if do_not_encode is None: - do_not_encode = [] - s = [] - e = utils.url_encode for k, v in self.params.items(): - if k in do_not_encode: - continue - s.append(e(str(k)) + "=" + e(str(v))) + s.append(str(k) + "=" + str(v)) - return s + if self.sort_params: + return sorted(s) + else: + return s @property def query_string(self): diff --git a/pubnub/utils.py b/pubnub/utils.py index bc036df9..e5ed7275 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,6 +1,13 @@ +import hmac import json import uuid as u import threading +try: + from hashlib import sha256 + digestmod = sha256 +except ImportError: + import Crypto.Hash.SHA256 as digestmod + sha256 = digestmod.new import six @@ -29,16 +36,16 @@ from urllib.parse import parse_qs as pn_parse_qs except ImportError: from urlparse import parse_qs as pn_parse_qs - -try: - from queue import Queue as Queue -except ImportError: - from Queue import Queue as Queue - -try: - from queue import Empty as QueueEmpty -except ImportError: - from Queue import Empty as QueueEmpty +# +# try: +# from queue import Queue as Queue +# except ImportError: +# from Queue import Queue as Queue +# +# try: +# from queue import Empty as QueueEmpty +# except ImportError: +# from Queue import Empty as QueueEmpty def get_data_for_user(data): @@ -64,12 +71,7 @@ def write_value_as_string(data): def url_encode(data): - try: - from urllib.parse import quote as q - except ImportError: - from urllib import quote as q - - return q(data) + return six.moves.urllib.parse.quote(data, safe="") def uuid(): @@ -87,6 +89,10 @@ def join_items(items_list): return ",".join(items_list) +def join_items_and_encode(items_list): + return ",".join(url_encode(x) for x in items_list) + + def join_channels(items_list): if len(items_list) == 0: return "," @@ -115,6 +121,7 @@ def synced_func(*args, **kws): return synced_func +# TODO: utils lib isn't a good place for this kid of helpers def is_subscribed_event(status): assert isinstance(status, PNStatus) return status.category == PNStatusCategory.PNConnectedCategory @@ -123,8 +130,50 @@ def is_subscribed_event(status): def is_unsubscribed_event(status): assert isinstance(status, PNStatus) return status.category == PNStatusCategory.PNAcknowledgmentCategory \ - and status.operation == PNOperationType.PNUnsubscribeOperation + and status.operation == PNOperationType.PNUnsubscribeOperation + + +def prepare_pam_arguments(unsorted_params): + sorted_keys = sorted(unsorted_params) + stringified_arguments = "" + i = 0 + + for key in sorted_keys: + if i != 0: + stringified_arguments += "&" + + stringified_arguments += (key + "=" + pam_encode(str(unsorted_params[key]))) + i += 1 + + return stringified_arguments + + +def pam_encode(s_url): + # !'()*~ + encoded = url_encode(s_url) + if encoded is not None: + encoded = (encoded.replace("*", "%2A") + .replace("!", "%21") + .replace("'", "%27") + .replace("(", "%28") + .replace(")", "%29") + .replace("[", "%5B") + .replace("]", "%5D") + .replace("~", "%7E")) + + return encoded + + +def sign_sha256(secret, sign_input): + from base64 import urlsafe_b64encode + + sign = urlsafe_b64encode(hmac.new( + secret.encode("utf-8"), + sign_input.encode("utf-8"), + sha256 + ).digest()) + return sign.decode("utf-8") def push_type_to_string(push_type): if push_type == PNPushType.APNS: diff --git a/tests/functional/test_grant.py b/tests/functional/test_grant.py new file mode 100644 index 00000000..027fef0f --- /dev/null +++ b/tests/functional/test_grant.py @@ -0,0 +1,50 @@ +import unittest + +from pubnub import utils +from pubnub.endpoints.access.grant import Grant +from pubnub.endpoints.presence.leave import Leave + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf_pam, sdk_name + + +class TestGrant(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf_pam, + sdk_name=sdk_name, + timestamp=MagicMock(return_value=123), + uuid=None + ) + self.pubnub.uuid = "UUID_GrantUnitTest" + self.grant = Grant(self.pubnub) + + def test_grant_read_and_write_to_channel(self): + self.grant.channels('ch').read(True).write(True) + + self.assertEquals(self.grant.build_path(), Grant.GRANT_PATH % pnconf_pam.subscribe_key) + + self.assertEqual(self.grant.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'r': '1', + 'w': '1', + 'timestamp': '123', + 'channel': 'ch', + 'signature': utils.sign_sha256(pnconf_pam.secret_key, + pnconf_pam.secret_key + "\n" + pnconf_pam.publish_key + "\n" + + "grant\n" + utils.prepare_pam_arguments({ + 'r': '1', + 'w': '1', + 'timestamp': 123, + 'channel': 'ch', + })) + }) + +# TODO: test no any flag are specified diff --git a/tests/helper.py b/tests/helper.py index 379da857..94035ea5 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -9,6 +9,10 @@ pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" sub_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pub_key_pam = "pub-c-98863562-19a6-4760-bf0b-d537d1f5c582" +sub_key_pam = "sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f" +sec_key_pam = "sec-c-MGFkMjQxYjMtNTUxZC00YzE3LWFiZGYtNzUwMjdjNmM3NDhk" + pnconf = PNConfiguration() pnconf.publish_key = pub_key pnconf.subscribe_key = sub_key @@ -29,6 +33,12 @@ pnconf_enc_sub.subscribe_key = sub_key pnconf_enc_sub.cipher_key = "testKey" +pnconf_pam = PNConfiguration() +pnconf_pam.publish_key = pub_key_pam +pnconf_pam.subscribe_key = sub_key_pam +pnconf_pam.secret_key = sec_key_pam +pnconf_pam.enable_subscribe = False + def pnconf_copy(): return copy(pnconf) @@ -41,6 +51,10 @@ def pnconf_sub_copy(): def pnconf_enc_copy(): return copy(pnconf_enc) + +def pnconf_pam_copy(): + return copy(pnconf_pam) + sdk_name = "Python-UnitTest" diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py new file mode 100644 index 00000000..3d8ff5bd --- /dev/null +++ b/tests/integrational/asyncio/test_pam.py @@ -0,0 +1,171 @@ +import pytest + +from pubnub.models.consumer.access_manager import PNAccessManagerGrantResult, PNAccessManagerAuditResult +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests import helper +from tests.helper import pnconf_pam_copy + + +@pytest.mark.asyncio +async def test_global_level(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + + env = (await pubnub.grant() + .write(True) + .read(True) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert len(env.result.channels) == 0 + assert len(env.result.groups) == 0 + assert env.result.read_enabled is True + assert env.result.write_enabled is True + assert env.result.manage_enabled is False + + env = (await pubnub.audit() + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert len(env.result.channels) >= 0 + assert len(env.result.groups) >= 0 + assert env.result.read_enabled is True + assert env.result.write_enabled is True + assert env.result.manage_enabled is False + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_single_channel(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + ch = helper.gen_channel("pam-channel") + + env = (await pubnub.grant() + .channels(ch) + .write(True) + .read(True) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.channels[ch].read_enabled == 1 + assert env.result.channels[ch].write_enabled == 1 + assert env.result.channels[ch].manage_enabled == 0 + + env = (await pubnub.audit() + .channels(ch) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.channels[ch].read_enabled == 1 + assert env.result.channels[ch].write_enabled == 1 + assert env.result.channels[ch].manage_enabled == 0 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_single_channel_with_auth(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + ch = helper.gen_channel("pam-channel") + auth = helper.gen_channel("pam-auth-key") + + env = (await pubnub.grant() + .channels(ch) + .write(True) + .read(True) + .auth_keys(auth) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.channels[ch].auth_keys[auth].read_enabled == 1 + assert env.result.channels[ch].auth_keys[auth].write_enabled == 1 + assert env.result.channels[ch].auth_keys[auth].manage_enabled == 0 + + env = (await pubnub.audit() + .channels(ch) + .auth_keys(auth) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.channels[ch].auth_keys[auth].read_enabled == 1 + assert env.result.channels[ch].auth_keys[auth].write_enabled == 1 + assert env.result.channels[ch].auth_keys[auth].manage_enabled == 0 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channels(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + ch1 = helper.gen_channel("pam-channel") + ch2 = helper.gen_channel("pam-channel") + + env = (await pubnub.grant() + .channels([ch1, ch2]) + .write(True) + .read(True) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.channels[ch1].read_enabled is True + assert env.result.channels[ch2].read_enabled is True + assert env.result.channels[ch1].write_enabled is True + assert env.result.channels[ch2].write_enabled is True + assert env.result.channels[ch1].manage_enabled is False + assert env.result.channels[ch2].manage_enabled is False + + env = (await pubnub.audit() + .channels([ch1, ch2]) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.channels[ch1].read_enabled is True + assert env.result.channels[ch2].read_enabled is True + assert env.result.channels[ch1].write_enabled is True + assert env.result.channels[ch2].write_enabled is True + assert env.result.channels[ch1].manage_enabled is False + assert env.result.channels[ch2].manage_enabled is False + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channels(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + ch1 = helper.gen_channel("pam-channel") + ch2 = helper.gen_channel("pam-channel") + auth = helper.gen_channel("pam-auth-key") + + env = (await pubnub.grant() + .channels([ch1, ch2]) + .write(True) + .read(True) + .auth_keys(auth) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.channels[ch1].auth_keys[auth].read_enabled is True + assert env.result.channels[ch2].auth_keys[auth].read_enabled is True + assert env.result.channels[ch1].auth_keys[auth].write_enabled is True + assert env.result.channels[ch2].auth_keys[auth].write_enabled is True + assert env.result.channels[ch1].auth_keys[auth].manage_enabled is False + assert env.result.channels[ch2].auth_keys[auth].manage_enabled is False + + env = (await pubnub.audit() + .channels([ch1, ch2]) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.channels[ch1].auth_keys[auth].read_enabled is True + assert env.result.channels[ch2].auth_keys[auth].read_enabled is True + assert env.result.channels[ch1].auth_keys[auth].write_enabled is True + assert env.result.channels[ch2].auth_keys[auth].write_enabled is True + assert env.result.channels[ch1].auth_keys[auth].manage_enabled is False + assert env.result.channels[ch2].auth_keys[auth].manage_enabled is False + + pubnub.stop() diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index c94a81ab..cb4ce3ad 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -50,3 +50,28 @@ def match(expected_str, actual_str): match("https://ex.com/?a=2&b=qwer", build_url("https", "ex.com", "/", "a=2&b=qwer")) + +class TestBuildUrl(unittest.TestCase): + def test_join_items_and_encode(self): + assert "a%2Fb,c%20d" == utils.join_items_and_encode(['a/b', 'c d']) + + +class TestPreparePAMArguments(unittest.TestCase): + def test_prepare_pam_arguments(self): + params = { + 'abc': True, + 'poq': 4, + 'def': False + } + + result = utils.prepare_pam_arguments(params) + assert result == 'abc=True&def=False&poq=4' + + def test_sign_sha_256(self): + input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f +pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 +grant +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.0&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" + result = utils.sign_sha256("my_key", input) + + assert "Dq92jnwRTCikdeP2nUs1__gyJthF8NChwbs5aYy2r_I=" == result From bedb777937f08594ac0ac96b49aada0f4faf614e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 15 Jul 2016 01:56:57 -0700 Subject: [PATCH 189/468] Fix tests --- pubnub/endpoints/presence/herenow.py | 2 +- pubnub/endpoints/presence/set_state.py | 4 ++-- pubnub/endpoints/pubsub/publish.py | 4 ++-- pubnub/endpoints/pubsub/subscribe.py | 4 ++-- pubnub/pubnub.py | 2 +- pubnub/pubnub_core.py | 4 ++-- pubnub/utils.py | 2 +- tests/functional/test_grant.py | 7 +++---- tests/functional/test_publish.py | 2 +- 9 files changed, 15 insertions(+), 16 deletions(-) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index 9cd2eb47..df461d31 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -35,7 +35,7 @@ def build_params(self): params = self.default_params() if len(self._channel_groups) > 0: - params['channel-groups'] = utils.join_items(self._channel_groups) + params['channel-groups'] = utils.join_items_and_encode(self._channel_groups) if self._include_state: params['state'] = "1" diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index 4360fccc..8658031a 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -34,10 +34,10 @@ def state(self, state): def build_params(self): params = self.default_params() - params['state'] = utils.write_value_as_string(self._state) + params['state'] = utils.url_encode(utils.write_value_as_string(self._state)) if len(self._groups) > 0: - params['channel-group'] = utils.join_items(self._groups) + params['channel-group'] = utils.join_items_and_encode(self._groups) return params diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 51ff9a85..e4aa611f 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -55,7 +55,7 @@ def build_params(self): params = self.default_params() if self._meta is not None: - params['meta'] = utils.write_value_as_string(self._meta) + params['meta'] = utils.url_encode(utils.write_value_as_string(self._meta)) if self._should_store is not None: if self._should_store: @@ -64,7 +64,7 @@ def build_params(self): params["store"] = "0" if self.pubnub.config.auth_key is not None: - params["auth"] = self.pubnub.config.auth_key + params["auth"] = utils.url_encode(self.pubnub.config.auth_key) params['seqn'] = str(self.publish_sequence_manager.get_next_sequence()) diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index fea523a8..231be767 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -61,10 +61,10 @@ def build_params(self): params = self.default_params() if len(self._groups) > 0: - params['channel-group'] = utils.join_items(self._groups) + params['channel-group'] = utils.join_items_and_encode(self._groups) if self._filter_expression is not None and len(self._filter_expression) > 0: - params['filter-expr'] = self._filter_expression + params['filter-expr'] = utils.url_encode(self._filter_expression) if self._timetoken is not None: params['tt'] = str(self._timetoken) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 21f2e75a..506392d6 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -7,7 +7,7 @@ from six.moves.queue import Queue from threading import Event -from pubnub.endpoints.presence.heartbeat import Heartbeat +from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe from .workers import SubscribeMessageWorker diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 92a641ab..1bb3b6d1 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -3,8 +3,8 @@ import time -from pubnub.endpoints.access.audit import Audit -from pubnub.endpoints.access.grant import Grant +from .endpoints.access.audit import Audit +from .endpoints.access.grant import Grant from .builders import SubscribeBuilder from .builders import UnsubscribeBuilder from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup diff --git a/pubnub/utils.py b/pubnub/utils.py index e5ed7275..8b936d09 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -97,7 +97,7 @@ def join_channels(items_list): if len(items_list) == 0: return "," else: - return join_items(items_list) + return join_items_and_encode(items_list) def extend_list(existing_items, new_items): diff --git a/tests/functional/test_grant.py b/tests/functional/test_grant.py index 027fef0f..f115a296 100644 --- a/tests/functional/test_grant.py +++ b/tests/functional/test_grant.py @@ -2,7 +2,6 @@ from pubnub import utils from pubnub.endpoints.access.grant import Grant -from pubnub.endpoints.presence.leave import Leave try: from mock import MagicMock @@ -38,13 +37,13 @@ def test_grant_read_and_write_to_channel(self): 'timestamp': '123', 'channel': 'ch', 'signature': utils.sign_sha256(pnconf_pam.secret_key, - pnconf_pam.secret_key + "\n" + pnconf_pam.publish_key + "\n" + + pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + "grant\n" + utils.prepare_pam_arguments({ 'r': '1', 'w': '1', 'timestamp': 123, 'channel': 'ch', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid })) }) - -# TODO: test no any flag are specified diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 64ad4fbd..369dc317 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -151,7 +151,7 @@ def test_pub_encrypted_list_message(self): pub = Publish(pubnub, self.sm) message = ["hi", "hi2", "hi3"] - encoded_message = "%22FQyKoIWWm7oN27zKyoU0bpjpgx49JxD04EI/0a8rg/o%3D%22" + encoded_message = "%22FQyKoIWWm7oN27zKyoU0bpjpgx49JxD04EI%2F0a8rg%2Fo%3D%22" pub.channel("ch1").message(message) From a447b75e26c9b8a20dd584f1cadd80cc7f9c91f3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 15 Jul 2016 02:06:03 -0700 Subject: [PATCH 190/468] Fix tests --- pubnub/pubnub.py | 6 +++--- pubnub/utils.py | 10 ---------- tests/integrational/native_threads/test_heartbeat.py | 3 --- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 506392d6..b954f921 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -4,7 +4,7 @@ import requests # noinspection PyUnresolvedReferences -from six.moves.queue import Queue +from six.moves.queue import Queue, Empty from threading import Event from .endpoints.presence.heartbeat import Heartbeat @@ -295,7 +295,7 @@ def executed_cb(self): class NativeSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): - self._message_queue = utils.Queue() + self._message_queue = Queue() self._consumer_event = threading.Event() self._subscribe_call = None self._heartbeat_periodic_callback = None @@ -455,7 +455,7 @@ def _take_message(self): if msg is not None: self._process_incoming_payload(msg) self._queue.task_done() - except utils.QueueEmpty: + except Empty: continue except Exception as e: # TODO: move to finally diff --git a/pubnub/utils.py b/pubnub/utils.py index 8b936d09..a34971d8 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -36,16 +36,6 @@ from urllib.parse import parse_qs as pn_parse_qs except ImportError: from urlparse import parse_qs as pn_parse_qs -# -# try: -# from queue import Queue as Queue -# except ImportError: -# from Queue import Queue as Queue -# -# try: -# from queue import Empty as QueueEmpty -# except ImportError: -# from Queue import Empty as QueueEmpty def get_data_for_user(data): diff --git a/tests/integrational/native_threads/test_heartbeat.py b/tests/integrational/native_threads/test_heartbeat.py index ef7a49a0..3f2386e5 100644 --- a/tests/integrational/native_threads/test_heartbeat.py +++ b/tests/integrational/native_threads/test_heartbeat.py @@ -21,9 +21,6 @@ class TestPubNubHeartbeat(unittest.TestCase): - def test_blah(self): - assert 'qwer' == 'sdfg' - def test_timeout_event_on_broken_heartbeat(self): ch = helper.gen_channel("heartbeat-test") From 3ee37098be4f0839dfe788f3ddc31d7864f9c3e3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 15 Jul 2016 10:06:54 -0700 Subject: [PATCH 191/468] Fix tests --- pubnub/endpoints/presence/herenow.py | 2 +- tests/functional/test_publish.py | 2 +- tests/functional/test_set_state.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/herenow.py index df461d31..c9c7a6ea 100755 --- a/pubnub/endpoints/presence/herenow.py +++ b/pubnub/endpoints/presence/herenow.py @@ -1,7 +1,7 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.enums import HttpMethod, PNOperationType -from pubnub.models.consumer.presence import PNHereNowResult, PNHereNowOccupantsData, PNHereNowChannelData +from pubnub.models.consumer.presence import PNHereNowResult class HereNow(Endpoint): diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 369dc317..1f0f7a95 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -72,7 +72,7 @@ def test_pub_with_meta(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'meta': json.dumps(meta), + 'meta': '%5B%22m1%22%2C%20%22m2%22%5D', 'seqn': '2' }) diff --git a/tests/functional/test_set_state.py b/tests/functional/test_set_state.py index 85421143..9b6524c3 100644 --- a/tests/functional/test_set_state.py +++ b/tests/functional/test_set_state.py @@ -34,7 +34,7 @@ def test_set_state_single_channel(self): self.assertEqual(self.set_state.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'state': json.dumps(self.state) + 'state': '%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D' }) self.assertEqual(self.set_state._channels, ['ch']) @@ -49,7 +49,7 @@ def test_set_state_single_group(self): self.assertEqual(self.set_state.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'state': json.dumps(self.state), + 'state': '%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D', 'channel-group': 'gr' }) From 2bef0b63f52e4590d8437a1aac43b00b0b8668e8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 15 Jul 2016 11:42:04 -0700 Subject: [PATCH 192/468] Fix tests; Add detailed run options for each Python version --- scripts/run-tests.py | 20 ++++++++++++++----- setup.cfg | 3 +++ .../native_threads/test_subscribe.py | 3 ++- 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 setup.cfg diff --git a/scripts/run-tests.py b/scripts/run-tests.py index fceebd74..4010c485 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -21,9 +21,19 @@ def run(command): return check_call(command, shell=True) -if version.startswith('2.7'): - run('py.test --cov=../pubnub') -elif version.startswith('2.6'): - run('py.test --cov=../pubnub --ignore=integrational/tornado/ --ignore=integrational/twisted/') +if version.startswith('2.6'): + run('py.test --cov=../pubnub --ignore=integrational/tornado/ --ignore=integrational/twisted/ --ignore=integrational/asyncio/') +elif version.startswith('2.7'): + # TODO: remove twisted ignore option when the tests will be ready + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') +elif version.startswith('3.3'): + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') +elif version.startswith('3.4'): + # TODO: rewrite asyncio SDK to support Python 3.4 + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') +elif version.startswith('3.5'): + run('py.test --cov=../pubnub --ignore=integrational/twisted/') +elif version.startswith('3.6'): + run('py.test --cov=../pubnub --ignore=integrational/twisted/') else: - run('py.test --cov=../pubnub/ --ignore=integrational/twisted/') + raise Exception("Version %s is not supported by this script runner" % version) diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 00000000..8809d0b6 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,3 @@ +[pytest] +norecursedirs = benchmarks + diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index 85e010f1..fc339f40 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -47,7 +47,8 @@ def test_subscribe_pub_unsubscribe(self): subscribe_listener.wait_for_connect() pubnub.publish().channel(ch).message(message).async(publish_operation.callback) - if not publish_operation.await(): + + if publish_operation.await() is False: self.fail("Publish operation timeout") publish_result = publish_operation.result From c8ffaf5347e70d992ed62a7cfceb7d343e432e8e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 02:29:32 -0700 Subject: [PATCH 193/468] Update dev dependencies --- requirements.txt => requirements-dev.txt | 0 requirements26.txt => requirements26-dev.txt | 0 requirements27-dev.txt | 2 ++ scripts/install.sh | 6 ++++-- 4 files changed, 6 insertions(+), 2 deletions(-) rename requirements.txt => requirements-dev.txt (100%) rename requirements26.txt => requirements26-dev.txt (100%) create mode 100644 requirements27-dev.txt diff --git a/requirements.txt b/requirements-dev.txt similarity index 100% rename from requirements.txt rename to requirements-dev.txt diff --git a/requirements26.txt b/requirements26-dev.txt similarity index 100% rename from requirements26.txt rename to requirements26-dev.txt diff --git a/requirements27-dev.txt b/requirements27-dev.txt new file mode 100644 index 00000000..d252b881 --- /dev/null +++ b/requirements27-dev.txt @@ -0,0 +1,2 @@ +twisted +pyopenssl diff --git a/scripts/install.sh b/scripts/install.sh index fc3e3979..c135e593 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash pip install -r requirements.txt -if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26.txt; fi -if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install twisted pyopenssl; fi \ No newline at end of file +if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -r requirements27-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install -r requirements34-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi \ No newline at end of file From 9c183437c007e0b595768b9e276964c53b08eba2 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 02:42:18 -0700 Subject: [PATCH 194/468] Reconfigure tests runner --- requirements-dev.txt | 1 - requirements27-dev.txt | 1 + requirements34-dev.txt | 1 + requirements35-dev.txt | 1 + scripts/install.sh | 2 +- 5 files changed, 4 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 01725db8..1655b5ca 100755 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,7 +1,6 @@ pytest pytest-cov codecov -tornado vcrpy pycrypto pytest-benchmark \ No newline at end of file diff --git a/requirements27-dev.txt b/requirements27-dev.txt index d252b881..f928fcea 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,2 +1,3 @@ twisted +tornado pyopenssl diff --git a/requirements34-dev.txt b/requirements34-dev.txt index 2d73dba5..c3175b52 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -1 +1,2 @@ pytest-asyncio +tornado diff --git a/requirements35-dev.txt b/requirements35-dev.txt index 2d73dba5..3fc2c4b1 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -1 +1,2 @@ pytest-asyncio +tornado \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh index c135e593..70fb3e8a 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -pip install -r requirements.txt +pip install -r requirements-dev.txt if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -r requirements27-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install -r requirements34-dev.txt; fi From 26f8ab5e6b2cd45a62b3d40cca774081681ddc41 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 03:26:46 -0700 Subject: [PATCH 195/468] Add requirements for Python 3.3 --- requirements33-dev.txt | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 requirements33-dev.txt diff --git a/requirements33-dev.txt b/requirements33-dev.txt new file mode 100644 index 00000000..c3175b52 --- /dev/null +++ b/requirements33-dev.txt @@ -0,0 +1,2 @@ +pytest-asyncio +tornado From c688b6e7298b3156a95a4fc4a66556f58f505bcb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 07:45:27 -0700 Subject: [PATCH 196/468] Fix funcitonal state tests --- tests/functional/test_set_state.py | 23 ++++++++++++----------- tests/helper.py | 7 +++++++ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/tests/functional/test_set_state.py b/tests/functional/test_set_state.py index 9b6524c3..1cf66c33 100644 --- a/tests/functional/test_set_state.py +++ b/tests/functional/test_set_state.py @@ -2,6 +2,7 @@ import unittest from pubnub.endpoints.presence.set_state import SetState +from tests import helper try: from mock import MagicMock @@ -31,11 +32,11 @@ def test_set_state_single_channel(self): "ch", self.pubnub.uuid)) - self.assertEqual(self.set_state.build_params(), { - 'pnsdk': sdk_name, - 'uuid': self.pubnub.uuid, - 'state': '%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D' - }) + params = self.set_state.build_params() + self.assertEqual(params['pnsdk'], sdk_name) + self.assertEqual(params['uuid'], self.pubnub.uuid) + self.assertEqual(json.loads(helper.url_decode(params['state'])), + json.loads(helper.url_decode('%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D'))) self.assertEqual(self.set_state._channels, ['ch']) @@ -46,12 +47,12 @@ def test_set_state_single_group(self): ",", self.pubnub.uuid)) - self.assertEqual(self.set_state.build_params(), { - 'pnsdk': sdk_name, - 'uuid': self.pubnub.uuid, - 'state': '%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D', - 'channel-group': 'gr' - }) + params = self.set_state.build_params() + self.assertEqual(params['pnsdk'], sdk_name) + self.assertEqual(params['uuid'], self.pubnub.uuid) + self.assertEqual(params['channel-group'], 'gr') + self.assertEqual(json.loads(helper.url_decode(params['state'])), + json.loads(helper.url_decode('%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D'))) assert len(self.set_state._channels) == 0 self.assertEqual(self.set_state._groups, ['gr']) diff --git a/tests/helper.py b/tests/helper.py index 94035ea5..f11eebfa 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -3,6 +3,9 @@ import random from copy import copy + +import six + from pubnub import utils from pubnub.pnconfiguration import PNConfiguration @@ -62,6 +65,10 @@ def url_encode(data): return utils.url_encode(utils.write_value_as_string(data)) +def url_decode(data): + return six.moves.urllib.parse.unquote(data) + + def gen_channel(prefix): return "%s-%s" % (prefix, gen_string(8)) From 3f744b76eeb3ff5e9895435801ddb19fbca0b69b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 08:29:01 -0700 Subject: [PATCH 197/468] Add missing tornado package in Python3.3 runner --- scripts/install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/install.sh b/scripts/install.sh index 70fb3e8a..22f7913b 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -3,5 +3,6 @@ pip install -r requirements-dev.txt if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -r requirements27-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install -r requirements33-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install -r requirements34-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi \ No newline at end of file From 91a04194019ba6e9b098dfc745b307e13b571856 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 08:34:33 -0700 Subject: [PATCH 198/468] Add pypy runner --- requirements-pypy-dev.txt | 2 ++ scripts/install.sh | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 requirements-pypy-dev.txt diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt new file mode 100644 index 00000000..3fc2c4b1 --- /dev/null +++ b/requirements-pypy-dev.txt @@ -0,0 +1,2 @@ +pytest-asyncio +tornado \ No newline at end of file diff --git a/scripts/install.sh b/scripts/install.sh index 22f7913b..accfd386 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -5,4 +5,5 @@ if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26-dev.t if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -r requirements27-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install -r requirements33-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install -r requirements34-dev.txt; fi -if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi \ No newline at end of file +if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == "pypy" ]]; then pip install -r requirements-pypy-dev.txt; fi \ No newline at end of file From 198c50f155ff5b50047b5731c8707f2e3ff980b8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 08:46:43 -0700 Subject: [PATCH 199/468] Add aiohttp to python 3.3, 3.4, 3.5 --- requirements33-dev.txt | 1 + requirements34-dev.txt | 1 + requirements35-dev.txt | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/requirements33-dev.txt b/requirements33-dev.txt index c3175b52..c680ba33 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,2 +1,3 @@ pytest-asyncio tornado +aiohttp \ No newline at end of file diff --git a/requirements34-dev.txt b/requirements34-dev.txt index c3175b52..c680ba33 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -1,2 +1,3 @@ pytest-asyncio tornado +aiohttp \ No newline at end of file diff --git a/requirements35-dev.txt b/requirements35-dev.txt index 3fc2c4b1..c680ba33 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -1,2 +1,3 @@ pytest-asyncio -tornado \ No newline at end of file +tornado +aiohttp \ No newline at end of file From 1f90e02ebfac1a7a918d073eb871adfd81e72e57 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 18 Jul 2016 08:49:40 -0700 Subject: [PATCH 200/468] Add pypy runner --- scripts/run-tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 4010c485..4c25c165 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -35,5 +35,7 @@ def run(command): run('py.test --cov=../pubnub --ignore=integrational/twisted/') elif version.startswith('3.6'): run('py.test --cov=../pubnub --ignore=integrational/twisted/') +elif version.startswith('pypy'): + run('py.test --cov=../pubnub --ignore=integrational/twisted/') else: raise Exception("Version %s is not supported by this script runner" % version) From baa6a8444fce0b9795dff7c9f8762a22e77936b6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 06:57:50 -0700 Subject: [PATCH 201/468] Add pyvcr wrapper to stub time.sleeps --- tests/helper.py | 36 ++++++- .../add_channel_remove_group.yaml | 98 +++++++++++++++++++ .../add_remove_multiple_channels.yaml | 98 +++++++++++++++++++ .../channel_groups/single_channel.yaml | 98 +++++++++++++++++++ .../native_sync/test_channel_groups.py | 46 +++++---- 5 files changed, 353 insertions(+), 23 deletions(-) create mode 100644 tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml create mode 100644 tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml create mode 100644 tests/integrational/fixtures/channel_groups/single_channel.yaml diff --git a/tests/helper.py b/tests/helper.py index f11eebfa..4e1412f8 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,14 +1,19 @@ +import os import threading import string import random - -from copy import copy - import six +import vcr +from copy import copy from pubnub import utils from pubnub.pnconfiguration import PNConfiguration +try: + from mock import patch +except ImportError: + from unittest.mock import patch + pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" sub_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" @@ -59,6 +64,9 @@ def pnconf_pam_copy(): return copy(pnconf_pam) sdk_name = "Python-UnitTest" +pn_vcr = vcr.VCR( + cassette_library_dir=os.path.dirname((os.path.dirname(os.path.abspath(__file__)))) +) def url_encode(data): @@ -77,6 +85,28 @@ def gen_string(l): return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(l)) +def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): + context = pn_vcr.use_cassette(cassette_name, filter_query_parameters=filter_query_parameters) + cs = context.cls(path=cassette_name).load(path=cassette_name) + + def _inner(f): + @patch('time.sleep', return_value=None) + @six.wraps(f) + def stubbed(*args): + with context as cassette: + largs = list(args) + largs.pop(1) + return f(*largs) + + @six.wraps(f) + def original(*args): + with context as cassette: + return f(*args) + + return stubbed if len(cs) > 0 else original + return _inner + + class CountDownLatch(object): def __init__(self, count=1): self.count = count diff --git a/tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml new file mode 100644 index 00000000..188e2b6d --- /dev/null +++ b/tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml @@ -0,0 +1,98 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?add=herenow-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:07 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["herenow-unit-ch"], "group": + "herenow-unit-cg"}, "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['136'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:08 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:08 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "herenow-unit-cg"}, + "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['119'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:10 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml new file mode 100644 index 00000000..530a7af4 --- /dev/null +++ b/tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml @@ -0,0 +1,98 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?add=herenow-unit-ch1%2Cherenow-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:10 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["herenow-unit-ch1", "herenow-unit-ch2"], + "group": "herenow-unit-cg"}, "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['157'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:11 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=herenow-unit-ch1%2Cherenow-unit-ch2 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:11 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "herenow-unit-cg"}, + "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['119'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:12 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/channel_groups/single_channel.yaml b/tests/integrational/fixtures/channel_groups/single_channel.yaml new file mode 100644 index 00000000..03d7b5d6 --- /dev/null +++ b/tests/integrational/fixtures/channel_groups/single_channel.yaml @@ -0,0 +1,98 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?add=herenow-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:12 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["herenow-unit-ch"], "group": + "herenow-unit-cg"}, "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['136'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:15 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=herenow-unit-ch + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:15 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "herenow-unit-cg"}, + "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['119'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 13:53:17 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 4b314559..7b1e3b6b 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -1,4 +1,3 @@ -import threading import unittest import logging import pubnub @@ -7,31 +6,32 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub -from tests import helper -from tests.helper import pnconf_copy +from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubChannelGroups(unittest.TestCase): + @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/channel_groups/single_channel.yaml', + filter_query_parameters=['uuid']) def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "herenow-unit-ch" + gr = "herenow-unit-cg" pubnub = PubNub(pnconf_copy()) # add result = pubnub.add_channel_to_channel_group() \ - .channels(ch)\ - .channel_group(gr)\ + .channels(ch) \ + .channel_group(gr) \ .sync() assert isinstance(result, PNChannelGroupsAddChannelResult) - time.sleep(1) + time.sleep(2) # list - result = pubnub.list_channels_in_channel_group()\ - .channel_group(gr)\ + result = pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ .sync() assert isinstance(result, PNChannelGroupsListResult) @@ -40,26 +40,29 @@ def test_single_channel(self): # remove result = pubnub.remove_channel_from_channel_group() \ - .channels(ch)\ - .channel_group(gr)\ + .channels(ch) \ + .channel_group(gr) \ .sync() assert isinstance(result, PNChannelGroupsRemoveChannelResult) - time.sleep(1) + time.sleep(2) # list - result = pubnub.list_channels_in_channel_group()\ - .channel_group(gr)\ + result = pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ .sync() assert isinstance(result, PNChannelGroupsListResult) assert len(result.channels) == 0 + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml', + filter_query_parameters=['uuid']) def test_add_remove_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch1 = "herenow-unit-ch1" + ch2 = "herenow-unit-ch2" + gr = "herenow-unit-cg" pubnub = PubNub(pnconf_copy()) # add @@ -100,9 +103,12 @@ def test_add_remove_multiple_channels(self): assert isinstance(result, PNChannelGroupsListResult) assert len(result.channels) == 0 + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml', + filter_query_parameters=['uuid']) def test_add_channel_remove_group(self): - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "herenow-unit-ch" + gr = "herenow-unit-cg" pubnub = PubNub(pnconf_copy()) # add From 823bf79607661a874efabf58940402b725fe420a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 07:29:33 -0700 Subject: [PATCH 202/468] Move fixtures to another folder --- .../channel_groups/add_channel_remove_group.yaml | 0 .../channel_groups/add_remove_multiple_channels.yaml | 0 .../fixtures/{ => native_sync}/channel_groups/single_channel.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename tests/integrational/fixtures/{ => native_sync}/channel_groups/add_channel_remove_group.yaml (100%) rename tests/integrational/fixtures/{ => native_sync}/channel_groups/add_remove_multiple_channels.yaml (100%) rename tests/integrational/fixtures/{ => native_sync}/channel_groups/single_channel.yaml (100%) diff --git a/tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml similarity index 100% rename from tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml rename to tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml diff --git a/tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml similarity index 100% rename from tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml rename to tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml diff --git a/tests/integrational/fixtures/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml similarity index 100% rename from tests/integrational/fixtures/channel_groups/single_channel.yaml rename to tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml From 31af36b1cf5a3bf513c9fdae2bbc08682d9fcc2b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 07:44:13 -0700 Subject: [PATCH 203/468] Add native sync publish fixtures --- .../native_sync/publish/invalid_key.yaml | 22 ++++++++ .../native_sync/publish/publish_bool_get.yaml | 22 ++++++++ .../publish/publish_bool_post.yaml | 24 +++++++++ .../publish/publish_do_not_store.yaml | 22 ++++++++ .../publish/publish_encrypted_list_get.yaml | 22 ++++++++ .../publish/publish_encrypted_list_post.yaml | 24 +++++++++ .../publish/publish_encrypted_string_get.yaml | 22 ++++++++ .../publish_encrypted_string_post.yaml | 24 +++++++++ .../native_sync/publish/publish_int_get.yaml | 22 ++++++++ .../native_sync/publish/publish_int_post.yaml | 24 +++++++++ .../native_sync/publish/publish_list_get.yaml | 22 ++++++++ .../publish/publish_list_post.yaml | 24 +++++++++ .../publish/publish_object_post.yaml | 24 +++++++++ .../publish/publish_string_get.yaml | 22 ++++++++ .../publish/publish_string_post.yaml | 24 +++++++++ .../native_sync/test_channel_groups.py | 6 +-- .../integrational/native_sync/test_publish.py | 51 +++++++++++++++---- 17 files changed, 389 insertions(+), 12 deletions(-) create mode 100644 tests/integrational/fixtures/native_sync/publish/invalid_key.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml new file mode 100644 index 00000000..83436c9f --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[0,"Invalid Key","14691119692918567"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['37'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + status: {code: 400, message: INVALID} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml new file mode 100644 index 00000000..68bbda37 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119695085971"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml new file mode 100644 index 00000000..a79784ef --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + dHJ1ZQ== + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['4'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119697248854"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml new file mode 100644 index 00000000..0bab5f0e --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1&store=0 + response: + body: {string: '[1,"Sent","14691119699221362"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml new file mode 100644 index 00000000..f2882fde --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119701316179"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml new file mode 100644 index 00000000..b10528eb --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + Ik0xU2NSdUtYQ0tmTC9DUVRUV25zdkEzSmVXZWhjMUNwMkFENWRtUGw0YzQ9Ig== + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['46'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119703765115"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml new file mode 100644 index 00000000..bcbb7169 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119705911160"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml new file mode 100644 index 00000000..aef35873 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + Ilg2KzNQbTJpckVJVXRtRmlzcGNtZXM0WHZsYUJyaUlsR2cycGpHOFQ2ZWc9Ig== + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['46'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119708241133"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml new file mode 100644 index 00000000..4914f6d1 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119710341756"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml new file mode 100644 index 00000000..dbd165b7 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + NQ== + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['1'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119712785973"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml new file mode 100644 index 00000000..87d32e29 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119714790991"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml new file mode 100644 index 00000000..d04020ef --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + WyJoaSIsICJoaTIiLCAiaGkzIl0= + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['20'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119717175739"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml new file mode 100644 index 00000000..919da166 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + eyJuYW1lIjogIkFsZXgiLCAib25saW5lIjogdHJ1ZX0= + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['32'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119720483041"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:32 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml new file mode 100644 index 00000000..91cfe42c --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119123769397"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:38:32 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml new file mode 100644 index 00000000..88a9cfc7 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -0,0 +1,24 @@ +interactions: +- request: + body: !!binary | + ImhpIg== + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + Content-Length: ['4'] + User-Agent: [PubNub-Python/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691119724317947"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:39:32 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 7b1e3b6b..29a2b500 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -12,7 +12,7 @@ class TestPubNubChannelGroups(unittest.TestCase): - @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/channel_groups/single_channel.yaml', + @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', filter_query_parameters=['uuid']) def test_single_channel(self): ch = "herenow-unit-ch" @@ -57,7 +57,7 @@ def test_single_channel(self): assert len(result.channels) == 0 @use_cassette_and_stub_time_sleep( - 'tests/integrational/fixtures/channel_groups/add_remove_multiple_channels.yaml', + 'tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml', filter_query_parameters=['uuid']) def test_add_remove_multiple_channels(self): ch1 = "herenow-unit-ch1" @@ -104,7 +104,7 @@ def test_add_remove_multiple_channels(self): assert len(result.channels) == 0 @use_cassette_and_stub_time_sleep( - 'tests/integrational/fixtures/channel_groups/add_channel_remove_group.yaml', + 'tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml', filter_query_parameters=['uuid']) def test_add_channel_remove_group(self): ch = "herenow-unit-ch" diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index 5ae848b1..e1adb25a 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -6,14 +6,14 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub -from tests.helper import pnconf, pnconf_enc +from tests.helper import pnconf, pnconf_enc, pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubPublish(unittest.TestCase): - # @vcr.use_cassette('integrational/fixtures/publish/publish_string_get.yaml', - # filter_query_parameters=['uuid']) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml', + filter_query_parameters=['uuid']) def test_publish_string_get(self): try: res = PubNub(pnconf).publish() \ @@ -26,8 +26,8 @@ def test_publish_string_get(self): except PubNubException as e: self.fail(e) - # @vcr.use_cassette('integrational/fixtures/publish/publish_list_get.yaml', - # filter_query_parameters=['uuid']) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml', + filter_query_parameters=['uuid']) def test_publish_list_get(self): try: res = PubNub(pnconf).publish() \ @@ -40,6 +40,9 @@ def test_publish_list_get(self): except PubNubException as e: self.fail(e) + # @vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml', + # filter_query_parameters=['uuid']) + # TODO: add matcher for serialized object def test_publish_object_get(self): try: res = PubNub(pnconf).publish() \ @@ -52,6 +55,8 @@ def test_publish_object_get(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml', + filter_query_parameters=['uuid']) def test_publish_bool_get(self): try: res = PubNub(pnconf).publish() \ @@ -64,6 +69,8 @@ def test_publish_bool_get(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml', + filter_query_parameters=['uuid']) def test_publish_int_get(self): try: res = PubNub(pnconf).publish() \ @@ -76,6 +83,8 @@ def test_publish_int_get(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml', + filter_query_parameters=['uuid']) def test_publish_encrypted_string_get(self): try: res = PubNub(pnconf_enc).publish() \ @@ -88,6 +97,8 @@ def test_publish_encrypted_string_get(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml', + filter_query_parameters=['uuid']) def test_publish_encrypted_list_get(self): try: res = PubNub(pnconf_enc).publish() \ @@ -100,13 +111,14 @@ def test_publish_encrypted_list_get(self): except PubNubException as e: self.fail(e) - # @vcr.use_cassette('integrational/fixtures/publish/publish_string_post.yaml', - # filter_query_parameters=['uuid']) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml', + filter_query_parameters=['uuid']) def test_publish_string_post(self): try: res = PubNub(pnconf).publish() \ .channel("ch1") \ .message("hi") \ + .use_post(True) \ .sync() assert isinstance(res, PNPublishResult) @@ -114,13 +126,14 @@ def test_publish_string_post(self): except PubNubException as e: self.fail(e) - # @vcr.use_cassette('integrational/fixtures/publish/publish_list_post.yaml', - # filter_query_parameters=['uuid']) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml', + filter_query_parameters=['uuid']) def test_publish_list_post(self): try: res = PubNub(pnconf).publish() \ .channel("ch1") \ .message(["hi", "hi2", "hi3"]) \ + .use_post(True) \ .sync() assert isinstance(res, PNPublishResult) @@ -128,11 +141,14 @@ def test_publish_list_post(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml', + filter_query_parameters=['uuid']) def test_publish_object_post(self): try: res = PubNub(pnconf).publish() \ .channel("ch1") \ .message({"name": "Alex", "online": True}) \ + .use_post(True) \ .sync() assert isinstance(res, PNPublishResult) @@ -140,11 +156,14 @@ def test_publish_object_post(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml', + filter_query_parameters=['uuid']) def test_publish_bool_post(self): try: res = PubNub(pnconf).publish() \ .channel("ch1") \ .message(True) \ + .use_post(True) \ .sync() assert isinstance(res, PNPublishResult) @@ -152,11 +171,14 @@ def test_publish_bool_post(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml', + filter_query_parameters=['uuid']) def test_publish_int_post(self): try: res = PubNub(pnconf).publish() \ .channel("ch1") \ .message(5) \ + .use_post(True) \ .sync() assert isinstance(res, PNPublishResult) @@ -164,6 +186,8 @@ def test_publish_int_post(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml', + filter_query_parameters=['uuid']) def test_publish_encrypted_string_post(self): try: res = PubNub(pnconf_enc).publish() \ @@ -177,6 +201,8 @@ def test_publish_encrypted_string_post(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml', + filter_query_parameters=['uuid']) def test_publish_encrypted_list_post(self): try: res = PubNub(pnconf_enc).publish() \ @@ -190,6 +216,8 @@ def test_publish_encrypted_list_post(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/invalid_key.yaml', + filter_query_parameters=['uuid']) def test_invalid_key(self): config = PNConfiguration() config.publish_key = "fake" @@ -242,6 +270,9 @@ def func(): except PubNubException as e: assert "not JSON serializable" in str(e) + # @vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml', + # filter_query_parameters=['uuid']) + # TODO: add matcher def test_publish_with_meta(self): meta = {'a': 2, 'b': 'qwer'} @@ -257,6 +288,8 @@ def test_publish_with_meta(self): except PubNubException as e: self.fail(e) + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml', + filter_query_parameters=['uuid']) def test_publish_do_not_store(self): try: res = PubNub(pnconf_enc).publish() \ From 5d6b592da755b865cfc8b7d9072c29f06a80afec Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 08:50:54 -0700 Subject: [PATCH 204/468] Add native/sync pubilsh assertion with custom vcr matcher --- tests/helper.py | 42 +++++++++++++++++-- .../publish/publish_with_meta.yaml | 22 ++++++++++ .../integrational/native_sync/test_publish.py | 5 +-- 3 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml diff --git a/tests/helper.py b/tests/helper.py index 4e1412f8..77b9be15 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,3 +1,4 @@ +import json import os import threading import string @@ -64,9 +65,6 @@ def pnconf_pam_copy(): return copy(pnconf_pam) sdk_name = "Python-UnitTest" -pn_vcr = vcr.VCR( - cassette_library_dir=os.path.dirname((os.path.dirname(os.path.abspath(__file__)))) -) def url_encode(data): @@ -85,6 +83,44 @@ def gen_string(l): return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(l)) +pn_vcr = vcr.VCR( + cassette_library_dir=os.path.dirname((os.path.dirname(os.path.abspath(__file__)))) +) + + +def meta_object_in_query_matcher(r1, r2): + return assert_request_equal_with_object_in_query(r1, r2, 'meta') + + +def assert_request_equal_with_object_in_query(r1, r2, query_field_name): + try: + assert r1.body == r2.body + assert r1.headers == r2.headers + assert r1.host == r2.host + assert r1.method == r2.method + assert r1.path == r2.path + assert r1.port == r2.port + assert r1.protocol == r2.protocol + assert r1.scheme == r2.scheme + + for v in r1.query: + if v[0] == query_field_name: + for w in r2.query: + if w[0] == query_field_name: + assert json.loads(v[1]) == json.loads(w[1]) + else: + for w in r2.query: + if w[0] == v[0]: + assert w[1] == v[1] + + except AssertionError: + return False + + return True + +pn_vcr.register_matcher('meta_object_in_query', meta_object_in_query_matcher) + + def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): context = pn_vcr.use_cassette(cassette_name, filter_query_parameters=filter_query_parameters) cs = context.cls(path=cassette_name).load(path=cassette_name) diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml new file mode 100644 index 00000000..e3d9e0ab --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691124461710414"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 14:47:26 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index e1adb25a..c0cfba0a 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -270,9 +270,8 @@ def func(): except PubNubException as e: assert "not JSON serializable" in str(e) - # @vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml', - # filter_query_parameters=['uuid']) - # TODO: add matcher + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml', + filter_query_parameters=['uuid'], match_on=['meta_object_in_query']) def test_publish_with_meta(self): meta = {'a': 2, 'b': 'qwer'} From 3230f1574d055e01ffe98e5fb310bbcee0a848d7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 10:02:57 -0700 Subject: [PATCH 205/468] Add native/sync pubilsh object vcr case --- tests/helper.py | 28 +++++++++++++++++++ .../publish/publish_object_get.yaml | 22 +++++++++++++++ .../integrational/native_sync/test_publish.py | 5 ++-- 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml diff --git a/tests/helper.py b/tests/helper.py index 77b9be15..cd63a38a 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -118,7 +118,35 @@ def assert_request_equal_with_object_in_query(r1, r2, query_field_name): return True + +def publish_object_matcher(r1, r2): + try: + assert r1.body == r2.body + assert r1.headers == r2.headers + assert r1.host == r2.host + assert r1.method == r2.method + assert r1.query == r2.query + assert r1.port == r2.port + assert r1.protocol == r2.protocol + assert r1.scheme == r2.scheme + + path1 = r1.path.split('/') + path2 = r2.path.split('/') + + for k, v in enumerate(path1): + if k == (len(path1) - 1): + assert json.loads(url_decode(v)) == json.loads(url_decode(path2[k])) + else: + assert v == path2[k] + + except AssertionError: + return False + + return True + + pn_vcr.register_matcher('meta_object_in_query', meta_object_in_query_matcher) +pn_vcr.register_matcher('publish_object', publish_object_matcher) def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml new file mode 100644 index 00000000..2b3ba5f0 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14691173575177499"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 16:09:17 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index c0cfba0a..10bc69e1 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -40,9 +40,8 @@ def test_publish_list_get(self): except PubNubException as e: self.fail(e) - # @vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml', - # filter_query_parameters=['uuid']) - # TODO: add matcher for serialized object + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml', + filter_query_parameters=['uuid'], match_on=['publish_object']) def test_publish_object_get(self): try: res = PubNub(pnconf).publish() \ From 4a90f2d021f3fb3180d5cdd9c479f30c9f9c4e0e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 10:38:59 -0700 Subject: [PATCH 206/468] Add native/sync state vcr cassettes --- tests/helper.py | 5 ++ .../state/state_of_multiple_channels.yaml | 51 +++++++++++++++++++ .../state/state_of_single_channel.yaml | 50 ++++++++++++++++++ .../native_sync/test_channel_groups.py | 3 ++ tests/integrational/native_sync/test_state.py | 15 ++++-- 5 files changed, 119 insertions(+), 5 deletions(-) create mode 100644 tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml create mode 100644 tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml diff --git a/tests/helper.py b/tests/helper.py index cd63a38a..6f765dc3 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -92,6 +92,10 @@ def meta_object_in_query_matcher(r1, r2): return assert_request_equal_with_object_in_query(r1, r2, 'meta') +def state_object_in_query_matcher(r1, r2): + return assert_request_equal_with_object_in_query(r1, r2, 'state') + + def assert_request_equal_with_object_in_query(r1, r2, query_field_name): try: assert r1.body == r2.body @@ -146,6 +150,7 @@ def publish_object_matcher(r1, r2): pn_vcr.register_matcher('meta_object_in_query', meta_object_in_query_matcher) +pn_vcr.register_matcher('state_object_in_query', state_object_in_query_matcher) pn_vcr.register_matcher('publish_object', publish_object_matcher) diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml new file mode 100644 index 00000000..23da9c5f --- /dev/null +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -0,0 +1,51 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['96'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 17:37:44 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": + {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": + "Alex"}}}, "service": "Presence", "uuid": "state-native-sync-uuid"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['228'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 17:37:45 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml new file mode 100644 index 00000000..ee2bf54d --- /dev/null +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -0,0 +1,50 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['96'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 17:37:45 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", + "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['165'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 17:37:46 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 29a2b500..8a94faf8 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -11,6 +11,9 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) +# TODO: rename channels name + + class TestPubNubChannelGroups(unittest.TestCase): @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', filter_query_parameters=['uuid']) diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py index 4414c5b0..8b0432bd 100644 --- a/tests/integrational/native_sync/test_state.py +++ b/tests/integrational/native_sync/test_state.py @@ -4,16 +4,18 @@ from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub -from tests import helper -from tests.helper import pnconf_copy +from tests.helper import pnconf_copy, pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubState(unittest.TestCase): + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml', + filter_query_parameters=['uuid'], match_on=['state_object_in_query']) def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") + ch = "state-native-sync-ch" pubnub = PubNub(pnconf_copy()) + pubnub.config.uuid = "state-native-sync-uuid" state = {"name": "Alex", "count": 5} result = pubnub.set_state().channels(ch).state(state).sync() @@ -28,10 +30,13 @@ def test_single_channel(self): assert result.channels[ch]['name'] == "Alex" assert result.channels[ch]['count'] == 5 + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml', + filter_query_parameters=['uuid'], match_on=['state_object_in_query']) def test_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") + ch1 = "state-native-sync-ch-1" + ch2 = "state-native-sync-ch-2" pubnub = PubNub(pnconf_copy()) + pubnub.config.uuid = "state-native-sync-uuid" state = {"name": "Alex", "count": 5} result = pubnub.set_state().channels([ch1, ch2]).state(state).sync() From 82d09f427c1389d86af4729d1c083b7c7970cb8b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 10:41:32 -0700 Subject: [PATCH 207/468] Fix namings for native/sync channel groups VCRs --- .../add_channel_remove_group.yaml | 27 ++++++++++--------- .../add_remove_multiple_channels.yaml | 27 ++++++++++--------- .../channel_groups/single_channel.yaml | 27 ++++++++++--------- .../native_sync/test_channel_groups.py | 17 +++++------- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index 188e2b6d..ba5f29e7 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?add=herenow-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:07 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:09 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,10 +31,11 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": ["herenow-unit-ch"], "group": - "herenow-unit-cg"}, "service": "channel-registry", "error": false}'} + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], + "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": + false}'} headers: Accept-Ranges: [bytes] Access-Control-Allow-Methods: [GET] @@ -42,9 +43,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['136'] + Content-Length: ['150'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:08 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:10 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -55,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -68,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:08 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:10 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -79,9 +80,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": [], "group": "herenow-unit-cg"}, + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} headers: Accept-Ranges: [bytes] @@ -90,9 +91,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['119'] + Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:10 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:11 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index 530a7af4..f4e12afb 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?add=herenow-unit-ch1%2Cherenow-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:10 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:12 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,10 +31,11 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": ["herenow-unit-ch1", "herenow-unit-ch2"], - "group": "herenow-unit-cg"}, "service": "channel-registry", "error": false}'} + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", + "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": + "channel-registry", "error": false}'} headers: Accept-Ranges: [bytes] Access-Control-Allow-Methods: [GET] @@ -42,9 +43,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['157'] + Content-Length: ['178'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:11 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:13 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -55,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=herenow-unit-ch1%2Cherenow-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -68,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:11 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:13 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -79,9 +80,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": [], "group": "herenow-unit-cg"}, + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} headers: Accept-Ranges: [bytes] @@ -90,9 +91,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['119'] + Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:12 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:14 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 03d7b5d6..6d8cc0a3 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?add=herenow-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:12 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:14 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,10 +31,11 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": ["herenow-unit-ch"], "group": - "herenow-unit-cg"}, "service": "channel-registry", "error": false}'} + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], + "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": + false}'} headers: Accept-Ranges: [bytes] Access-Control-Allow-Methods: [GET] @@ -42,9 +43,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['136'] + Content-Length: ['150'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:15 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:17 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -55,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=herenow-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -68,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:15 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:17 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -79,9 +80,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/herenow-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": [], "group": "herenow-unit-cg"}, + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} headers: Accept-Ranges: [bytes] @@ -90,9 +91,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['119'] + Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 13:53:17 GMT'] + Date: ['Thu, 21 Jul 2016 17:40:19 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 8a94faf8..77953cab 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -11,15 +11,12 @@ pubnub.set_stream_logger('pubnub', logging.DEBUG) -# TODO: rename channels name - - class TestPubNubChannelGroups(unittest.TestCase): @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', filter_query_parameters=['uuid']) def test_single_channel(self): - ch = "herenow-unit-ch" - gr = "herenow-unit-cg" + ch = "channel-groups-unit-ch" + gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) # add @@ -63,9 +60,9 @@ def test_single_channel(self): 'tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml', filter_query_parameters=['uuid']) def test_add_remove_multiple_channels(self): - ch1 = "herenow-unit-ch1" - ch2 = "herenow-unit-ch2" - gr = "herenow-unit-cg" + ch1 = "channel-groups-unit-ch1" + ch2 = "channel-groups-unit-ch2" + gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) # add @@ -110,8 +107,8 @@ def test_add_remove_multiple_channels(self): 'tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml', filter_query_parameters=['uuid']) def test_add_channel_remove_group(self): - ch = "herenow-unit-ch" - gr = "herenow-unit-cg" + ch = "channel-groups-unit-ch" + gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) # add From 79c3ce421a61c3692f16a0203d6f99a793a9cd5a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 11:02:32 -0700 Subject: [PATCH 208/468] Add native/threads state cassettes --- .../state/state_of_multiple_channels.yaml | 51 +++++++++++++++++++ .../state/state_of_single_channel.yaml | 50 ++++++++++++++++++ .../native_threads/test_state.py | 15 ++++-- 3 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml create mode 100644 tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml new file mode 100644 index 00000000..b563805b --- /dev/null +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -0,0 +1,51 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['96'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:00:22 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": + {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": + "Alex"}}}, "service": "Presence", "uuid": "state-native-sync-uuid"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['228'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:00:22 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml new file mode 100644 index 00000000..1412458f --- /dev/null +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -0,0 +1,50 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['96'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:00:23 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", + "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: ['OPTIONS, GET, POST'] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Connection: [keep-alive] + Content-Length: ['165'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:00:23 GMT'] + Server: [Pubnub Presence] + cache-control: [no-cache] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_threads/test_state.py b/tests/integrational/native_threads/test_state.py index 5f351f3a..42fb333a 100644 --- a/tests/integrational/native_threads/test_state.py +++ b/tests/integrational/native_threads/test_state.py @@ -5,8 +5,7 @@ from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub -from tests import helper -from tests.helper import pnconf_copy +from tests.helper import pnconf_copy, pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -20,9 +19,12 @@ def callback(self, response, status): self.status = status self.event.set() + @pn_vcr.use_cassette('tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml', + filter_query_parameters=['uuid'], match_on=['state_object_in_query']) def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") + ch = "state-native-sync-ch" pubnub = PubNub(pnconf_copy()) + pubnub.config.uuid = "state-native-sync-uuid" state = {"name": "Alex", "count": 5} pubnub.set_state() \ @@ -47,10 +49,13 @@ def test_single_channel(self): assert self.response.channels[ch]['name'] == "Alex" assert self.response.channels[ch]['count'] == 5 + @pn_vcr.use_cassette('tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml', + filter_query_parameters=['uuid'], match_on=['state_object_in_query']) def test_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") + ch1 = "state-native-sync-ch-1" + ch2 = "state-native-sync-ch-2" pubnub = PubNub(pnconf_copy()) + pubnub.config.uuid = "state-native-sync-uuid" state = {"name": "Alex", "count": 5} pubnub.set_state() \ From c9e5013a365a00ccaa898aaef26478d52bdacafa Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 21 Jul 2016 11:19:19 -0700 Subject: [PATCH 209/468] Add native/threads channel groups cassettes --- .../add_channel_remove_group.yaml | 99 +++++++++++++++++++ .../add_remove_multiple_channels.yaml | 99 +++++++++++++++++++ .../channel_groups/single_channel.yaml | 99 +++++++++++++++++++ .../native_threads/test_channel_groups.py | 25 +++-- 4 files changed, 313 insertions(+), 9 deletions(-) create mode 100644 tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml create mode 100644 tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml create mode 100644 tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml new file mode 100644 index 00000000..6220ecbd --- /dev/null +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -0,0 +1,99 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:17:22 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], + "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": + false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['150'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:17:23 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:17:23 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, + "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['126'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:17:24 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml new file mode 100644 index 00000000..1e4f23e0 --- /dev/null +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -0,0 +1,99 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:15:17 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", + "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": + "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['178'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:15:18 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:15:19 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, + "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['126'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:15:20 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml new file mode 100644 index 00000000..cdf80660 --- /dev/null +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -0,0 +1,99 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:18:36 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], + "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": + false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['150'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:18:37 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:18:37 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, + "service": "channel-registry", "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['126'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Thu, 21 Jul 2016 18:18:39 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_threads/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py index 4e52574e..1cfc2295 100644 --- a/tests/integrational/native_threads/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -7,8 +7,7 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub -from tests import helper -from tests.helper import pnconf_copy +from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -22,9 +21,11 @@ def callback(self, response, status): self.status = status self.event.set() + @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml', + filter_query_parameters=['uuid']) def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "channel-groups-unit-ch" + gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) # add @@ -73,10 +74,13 @@ def test_single_channel(self): assert len(self.response.channels) == 0 self.event.clear() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml', + filter_query_parameters=['uuid']) def test_add_remove_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch1 = "channel-groups-unit-ch1" + ch2 = "channel-groups-unit-ch2" + gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) # add @@ -126,9 +130,12 @@ def test_add_remove_multiple_channels(self): assert len(self.response.channels) == 0 self.event.clear() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml', + filter_query_parameters=['uuid']) def test_add_channel_remove_group(self): - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "channel-groups-unit-ch" + gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) # add From 3a9b57bd490fa1a41724073a2a971182303f9ab5 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 22 Jul 2016 07:33:23 -0700 Subject: [PATCH 210/468] Remove asyncio from Python 3.3 --- requirements33-dev.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/requirements33-dev.txt b/requirements33-dev.txt index c680ba33..c3368dfa 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,3 +1 @@ -pytest-asyncio tornado -aiohttp \ No newline at end of file From 9af1fc009c3f4bf819a11407e7c90339367f6d7d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 22 Jul 2016 07:44:49 -0700 Subject: [PATCH 211/468] Remove asyncio from pypy --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 4c25c165..0dc8515d 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -36,6 +36,6 @@ def run(command): elif version.startswith('3.6'): run('py.test --cov=../pubnub --ignore=integrational/twisted/') elif version.startswith('pypy'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/') + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') else: raise Exception("Version %s is not supported by this script runner" % version) From 1aee61d52a347452026e592fb9ee55ad90b43fb5 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 22 Jul 2016 08:05:21 -0700 Subject: [PATCH 212/468] Extend timeouts for tornado/here_now test --- tests/integrational/tornado/test_here_now.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index cad30b1a..48130602 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -13,11 +13,11 @@ def setUp(self): super(TestPubNubAsyncHereNow, self).setUp() self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - @tornado.testing.gen_test + @tornado.testing.gen_test(timeout=15) def test_single_channel(self): ch = helper.gen_channel("herenow-unit") yield connect_to_channel(self.pubnub, ch) - yield gen.sleep(2) + yield gen.sleep(4) env = yield self.pubnub.here_now() \ .channels(ch) \ .include_uuids(True) \ @@ -36,7 +36,7 @@ def test_single_channel(self): self.pubnub.stop() self.stop() - @tornado.testing.gen_test(timeout=10) + @tornado.testing.gen_test(timeout=15) def test_multiple_channels(self): ch1 = helper.gen_channel("here-now") ch2 = helper.gen_channel("here-now") @@ -61,13 +61,13 @@ def test_multiple_channels(self): self.pubnub.stop() self.stop() - @tornado.testing.gen_test + @tornado.testing.gen_test(timeout=15) def test_global(self): ch1 = helper.gen_channel("here-now") ch2 = helper.gen_channel("here-now") yield connect_to_channel(self.pubnub, [ch1, ch2]) - yield gen.sleep(2) + yield gen.sleep(4) env = yield self.pubnub.here_now().future() From 011f0ad6cc4d092f4da95bc5446ae055609f76a0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 22 Jul 2016 08:11:02 -0700 Subject: [PATCH 213/468] Remove pytest-asyncio from pypy dependencies --- requirements-pypy-dev.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt index 3fc2c4b1..716f2ab7 100644 --- a/requirements-pypy-dev.txt +++ b/requirements-pypy-dev.txt @@ -1,2 +1 @@ -pytest-asyncio tornado \ No newline at end of file From 5e3fe614379677f9e3bd50bf14aec42ac5fe4566 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 22 Jul 2016 08:16:23 -0700 Subject: [PATCH 214/468] Increase timeouts for tornado/subscribe tests --- tests/integrational/tornado/test_subscribe.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 9bd8474d..28035a3a 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -110,7 +110,7 @@ def setUp(self): self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - @tornado.testing.gen_test(timeout=30) + @tornado.testing.gen_test(timeout=60) def test_subscribe_unsubscribe(self): ch = helper.gen_channel("test-subscribe-unsubscribe-channel") gr = helper.gen_channel("test-subscribe-unsubscribe-group") @@ -131,7 +131,7 @@ def test_subscribe_unsubscribe(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - @tornado.testing.gen_test(timeout=30) + @tornado.testing.gen_test(timeout=60) def test_subscribe_publish_unsubscribe(self): ch = helper.gen_channel("test-subscribe-pub-unsubscribe-channel") gr = helper.gen_channel("test-subscribe-pub-unsubscribe-group") @@ -164,7 +164,7 @@ def test_subscribe_publish_unsubscribe(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - @tornado.testing.gen_test(timeout=30) + @tornado.testing.gen_test(timeout=60) def test_join_leave(self): self.pubnub.config.uuid = helper.gen_channel("messenger") self.pubnub_listener.config.uuid = helper.gen_channel("listener") From bb5cd71868dda2003560c82b06e1ec5f625a2b77 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 22 Jul 2016 08:35:17 -0700 Subject: [PATCH 215/468] Add a basic where now funtional --- pubnub/endpoints/presence/where_now.py | 50 ++++++++++++++++++++++++++ pubnub/errors.py | 1 + tests/functional/test_where_now.py | 32 +++++++++++++++++ 3 files changed, 83 insertions(+) create mode 100644 pubnub/endpoints/presence/where_now.py create mode 100644 tests/functional/test_where_now.py diff --git a/pubnub/endpoints/presence/where_now.py b/pubnub/endpoints/presence/where_now.py new file mode 100644 index 00000000..b6ef9e6e --- /dev/null +++ b/pubnub/endpoints/presence/where_now.py @@ -0,0 +1,50 @@ +import six + +from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.errors import PNERR_UUID_MISSING +from pubnub.exceptions import PubNubException + + +class WhereNow(Endpoint): + # /v2/presence/sub-key//uuid/ + WHERE_NOW_PATH = "/v2/presence/sub-key/%s/uuid/%s" + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._uuid = None + + def uuid(self, uuid): + self._uuid = uuid + return self + + def build_params(self): + return self.default_params() + + def build_path(self): + return WhereNow.WHERE_NOW_PATH % (self.pubnub.config.subscribe_key, self._uuid) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + + if self._uuid is None or not isinstance(self._uuid, six.string_types): + raise PubNubException(pn_error=PNERR_UUID_MISSING) + + def create_response(self, envelope): + pass + # return PNHereNowResult.from_json(envelope, self._channels) + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNWhereNowOperation + + def name(self): + return "WhereNow" diff --git a/pubnub/errors.py b/pubnub/errors.py index 0cd9d12f..9e7cef23 100755 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -22,6 +22,7 @@ PNERR_JSON_NOT_SERIALIZABLE = "Trying to publish not JSON serializable object" PNERR_CHANNEL_OR_GROUP_MISSING = "Channel or group missing" PNERR_STATE_MISSING = "State missing or not a dict" +PNERR_UUID_MISSING = "uuid missing or not a string" PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET = "State setter for channel groups is not supported yet" PNERR_PUSH_DEVICE_MISSING = "Device ID is missing for push operation" PNERROR_PUSH_TYPE_MISSING = "Push Type is missing" diff --git a/tests/functional/test_where_now.py b/tests/functional/test_where_now.py new file mode 100644 index 00000000..0dfdd255 --- /dev/null +++ b/tests/functional/test_where_now.py @@ -0,0 +1,32 @@ +import unittest + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.endpoints.presence.where_now import WhereNow +from pubnub.pubnub import PubNub +from tests.helper import pnconf, sdk_name + + +class TestWhereNow(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf, + sdk_name=sdk_name + ) + self.pubnub.uuid = "UUID_WhereNowTest" + self.where_now = WhereNow(self.pubnub) + + def test_where_now(self): + self.where_now.uuid("person_uuid") + + self.assertEquals(self.where_now.build_path(), WhereNow.WHERE_NOW_PATH + % (pnconf.subscribe_key, "person_uuid")) + + self.assertEqual(self.where_now.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) From 514a984ebe73cdda2fbc21851e6fc24e99e00d69 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 23 Jul 2016 01:07:15 -0700 Subject: [PATCH 216/468] Add WhereNow asyncio&tornado tests --- pubnub/endpoints/presence/where_now.py | 4 +- pubnub/models/consumer/presence.py | 10 +++ pubnub/pubnub_core.py | 8 ++- tests/integrational/asyncio/test_where_now.py | 69 +++++++++++++++++++ tests/integrational/tornado/test_where_now.py | 58 ++++++++++++++++ 5 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 tests/integrational/asyncio/test_where_now.py create mode 100644 tests/integrational/tornado/test_where_now.py diff --git a/pubnub/endpoints/presence/where_now.py b/pubnub/endpoints/presence/where_now.py index b6ef9e6e..80928cbf 100644 --- a/pubnub/endpoints/presence/where_now.py +++ b/pubnub/endpoints/presence/where_now.py @@ -4,6 +4,7 @@ from pubnub.enums import HttpMethod, PNOperationType from pubnub.errors import PNERR_UUID_MISSING from pubnub.exceptions import PubNubException +from pubnub.models.consumer.presence import PNWhereNowResult class WhereNow(Endpoint): @@ -34,8 +35,7 @@ def validate_params(self): raise PubNubException(pn_error=PNERR_UUID_MISSING) def create_response(self, envelope): - pass - # return PNHereNowResult.from_json(envelope, self._channels) + return PNWhereNowResult.from_json(envelope) def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index 8663d647..fc634554 100755 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -103,6 +103,16 @@ def __init__(self, uuid, state): self.state = state +class PNWhereNowResult(object): + def __init__(self, channels): + assert isinstance(channels, (list, tuple)) + self.channels = channels + + @classmethod + def from_json(cls, json_input): + return PNWhereNowResult(json_input['payload']['channels']) + + class PNSetStateResult(object): def __init__(self, state): assert isinstance(state, dict) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 1bb3b6d1..ee989bcc 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -1,8 +1,8 @@ import logging -from abc import ABCMeta, abstractmethod - import time +from abc import ABCMeta, abstractmethod + from .endpoints.access.audit import Audit from .endpoints.access.grant import Grant from .builders import SubscribeBuilder @@ -16,6 +16,7 @@ from .endpoints.presence.set_state import SetState from .endpoints.pubsub.publish import Publish from .endpoints.presence.herenow import HereNow +from .endpoints.presence.where_now import WhereNow from .endpoints.push.add_channels_to_push import AddChannelsToPush from .endpoints.push.remove_channels_from_push import RemoveChannelsFromPush @@ -90,6 +91,9 @@ def get_state(self): def here_now(self): return HereNow(self) + def where_now(self): + return WhereNow(self) + def publish(self): return Publish(self, self._publish_sequence_manager) diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py new file mode 100644 index 00000000..ddf3be72 --- /dev/null +++ b/tests/integrational/asyncio/test_where_now.py @@ -0,0 +1,69 @@ +import asyncio +import pytest + +from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + + +@pytest.mark.asyncio +async def test_single_channel(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + ch = helper.gen_channel("wherenow-asyncio-channel") + uuid = helper.gen_channel("wherenow-asyncio-uuid") + pubnub.config.uuid = uuid + + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe().channels(ch).execute() + + await callback.wait_for_connect() + + await asyncio.sleep(2) + + env = await pubnub.where_now() \ + .uuid(uuid) \ + .future() + + channels = env.result.channels + + assert len(channels) == 1 + assert channels[0] == ch + + pubnub.unsubscribe().channels(ch).execute() + await callback.wait_for_disconnect() + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channels(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + ch1 = helper.gen_channel("here-now") + ch2 = helper.gen_channel("here-now") + uuid = helper.gen_channel("wherenow-asyncio-uuid") + pubnub.config.uuid = uuid + + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe().channels([ch1, ch2]).execute() + + await callback.wait_for_connect() + + await asyncio.sleep(5) + + env = await pubnub.where_now() \ + .uuid(uuid) \ + .future() + + channels = env.result.channels + + assert len(channels) == 2 + assert ch1 in channels + assert ch2 in channels + + pubnub.unsubscribe().channels([ch1, ch2]).execute() + await callback.wait_for_disconnect() + + pubnub.stop() diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py new file mode 100644 index 00000000..1d3030ca --- /dev/null +++ b/tests/integrational/tornado/test_where_now.py @@ -0,0 +1,58 @@ +import tornado +from tornado import gen +from tornado.testing import AsyncHTTPTestCase, AsyncTestCase + +from pubnub.pubnub_tornado import PubNubTornado +from tests import helper +from tests.helper import pnconf_sub_copy +from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel + + +class TestPubNubAsyncWhereNow(AsyncTestCase): + def setUp(self): + super(TestPubNubAsyncWhereNow, self).setUp() + self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + + @tornado.testing.gen_test(timeout=15) + def test_single_channel(self): + ch = helper.gen_channel("wherenow-asyncio-channel") + uuid = helper.gen_channel("wherenow-asyncio-uuid") + self.pubnub.config.uuid = uuid + + yield connect_to_channel(self.pubnub, ch) + yield gen.sleep(5) + env = yield self.pubnub.where_now() \ + .uuid(uuid) \ + .future() + + channels = env.result.channels + + assert len(channels) == 1 + assert channels[0] == ch + + yield disconnect_from_channel(self.pubnub, ch) + self.pubnub.stop() + self.stop() + + @tornado.testing.gen_test(timeout=15) + def test_multiple_channels(self): + ch1 = helper.gen_channel("here-now") + ch2 = helper.gen_channel("here-now") + uuid = helper.gen_channel("wherenow-asyncio-uuid") + self.pubnub.config.uuid = uuid + + yield connect_to_channel(self.pubnub, [ch1, ch2]) + yield gen.sleep(5) + env = yield self.pubnub.where_now() \ + .uuid(uuid) \ + .future() + + channels = env.result.channels + + assert len(channels) == 2 + assert ch1 in channels + assert ch2 in channels + + yield disconnect_from_channel(self.pubnub, [ch1, ch2]) + self.pubnub.stop() + self.stop() From 9b8d907e4219ffd0be8e33e4f7ca5b6c8a1b23be Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 23 Jul 2016 02:02:27 -0700 Subject: [PATCH 217/468] Add native/threads WhereNow test --- .../native_threads/test_where_now.py | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 tests/integrational/native_threads/test_where_now.py diff --git a/tests/integrational/native_threads/test_where_now.py b/tests/integrational/native_threads/test_where_now.py new file mode 100644 index 00000000..f8945592 --- /dev/null +++ b/tests/integrational/native_threads/test_where_now.py @@ -0,0 +1,90 @@ +import unittest +import logging +import time +import pubnub +import threading + +from pubnub.pubnub import PubNub, SubscribeListener, NonSubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubState(unittest.TestCase): + def setUp(self): + self.event = threading.Event() + + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() + + def test_single_channel(self): + pubnub = PubNub(pnconf_sub_copy()) + ch = helper.gen_channel("wherenow-asyncio-channel") + uuid = helper.gen_channel("wherenow-asyncio-uuid") + pubnub.config.uuid = uuid + + subscribe_listener = SubscribeListener() + where_now_listener = NonSubscribeListener() + pubnub.add_listener(subscribe_listener) + pubnub.subscribe().channels(ch).execute() + + subscribe_listener.wait_for_connect() + + time.sleep(2) + + pubnub.where_now() \ + .uuid(uuid) \ + .async(where_now_listener.callback) + + if where_now_listener.await() is False: + self.fail("WhereNow operation timeout") + + result = where_now_listener.result + channels = result.channels + + assert len(channels) == 1 + assert channels[0] == ch + + pubnub.unsubscribe().channels(ch).execute() + subscribe_listener.wait_for_disconnect() + + pubnub.stop() + + def test_multiple_channels(self): + + pubnub = PubNub(pnconf_sub_copy()) + ch1 = "state-native-sync-ch-1" + ch2 = "state-native-sync-ch-2" + pubnub.config.uuid = "state-native-sync-uuid" + uuid = pubnub.config.uuid + + subscribe_listener = SubscribeListener() + where_now_listener = NonSubscribeListener() + pubnub.add_listener(subscribe_listener) + pubnub.subscribe().channels([ch1, ch2]).execute() + + subscribe_listener.wait_for_connect() + + time.sleep(2) + + pubnub.where_now() \ + .uuid(uuid) \ + .async(where_now_listener.callback) + + if where_now_listener.await() is False: + self.fail("WhereNow operation timeout") + + result = where_now_listener.result + channels = result.channels + + assert len(channels) == 2 + assert ch1 in channels + assert ch2 in channels + + pubnub.unsubscribe().channels([ch1, ch2]).execute() + subscribe_listener.wait_for_disconnect() + + pubnub.stop() From a4052049782e5c8011f6c152ec290140a91a3890 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 23 Jul 2016 09:59:51 -0700 Subject: [PATCH 218/468] Add native/threads here_now tests --- .../native_sync/test_here_now.py | 18 ---- .../native_threads/test_here_now.py | 96 ++++++++++++++++--- 2 files changed, 82 insertions(+), 32 deletions(-) delete mode 100644 tests/integrational/native_sync/test_here_now.py diff --git a/tests/integrational/native_sync/test_here_now.py b/tests/integrational/native_sync/test_here_now.py deleted file mode 100644 index a094e020..00000000 --- a/tests/integrational/native_sync/test_here_now.py +++ /dev/null @@ -1,18 +0,0 @@ -from pubnub.pubnub import PubNub - -import unittest -import logging -import pubnub -from tests.helper import pnconf - -pubnub.set_stream_logger('pubnub', logging.DEBUG) - - -class TestPubNubSyncHereNow(unittest.TestCase): - def test_success(self): - res = PubNub(pnconf).here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .sync() - - print(res.total_occupancy) diff --git a/tests/integrational/native_threads/test_here_now.py b/tests/integrational/native_threads/test_here_now.py index 3940d355..cbbee208 100644 --- a/tests/integrational/native_threads/test_here_now.py +++ b/tests/integrational/native_threads/test_here_now.py @@ -1,24 +1,92 @@ import unittest import logging +import time import pubnub +import threading -from pubnub.pubnub import PubNub -from tests.helper import pnconf +from pubnub.pubnub import PubNub, SubscribeListener, NonSubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy pubnub.set_stream_logger('pubnub', logging.DEBUG) -class TestPubNubHereNow(unittest.TestCase): - def test_success(self): - def callback(res, status): - print("response", res) - print("status", status) +class TestPubNubState(unittest.TestCase): + def setUp(self): + self.event = threading.Event() - thread = PubNub(pnconf).here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .async(callback) + def callback(self, response, status): + self.response = response + self.status = status + self.event.set() - print("awaiting") - thread.join() - print("finished") + def test_single_channel(self): + pubnub = PubNub(pnconf_sub_copy()) + ch = helper.gen_channel("herenow-asyncio-channel") + uuid = helper.gen_channel("herenow-asyncio-uuid") + pubnub.config.uuid = uuid + + subscribe_listener = SubscribeListener() + here_now_listener = NonSubscribeListener() + pubnub.add_listener(subscribe_listener) + pubnub.subscribe().channels(ch).execute() + + subscribe_listener.wait_for_connect() + + time.sleep(2) + + pubnub.here_now() \ + .channels(ch) \ + .include_uuids(True) \ + .async(here_now_listener.callback) + + if here_now_listener.await() is False: + self.fail("HereNow operation timeout") + + result = here_now_listener.result + channels = result.channels + + assert len(channels) == 1 + assert channels[0].occupancy == 1 + assert channels[0].occupants[0].uuid == pubnub.uuid + + pubnub.unsubscribe().channels(ch).execute() + subscribe_listener.wait_for_disconnect() + + pubnub.stop() + + def test_multiple_channels(self): + pubnub = PubNub(pnconf_sub_copy()) + ch1 = helper.gen_channel("here-now-native-sync-ch1") + ch2 = helper.gen_channel("here-now-native-sync-ch2") + pubnub.config.uuid = "here-now-native-sync-uuid" + + subscribe_listener = SubscribeListener() + here_now_listener = NonSubscribeListener() + pubnub.add_listener(subscribe_listener) + pubnub.subscribe().channels([ch1, ch2]).execute() + + subscribe_listener.wait_for_connect() + + time.sleep(5) + + pubnub.here_now() \ + .channels([ch1, ch2]) \ + .async(here_now_listener.callback) + + if here_now_listener.await() is False: + self.fail("HereNow operation timeout") + + result = here_now_listener.result + channels = result.channels + + assert len(channels) == 2 + assert channels[0].occupancy == 1 + assert channels[0].occupants[0].uuid == pubnub.uuid + assert channels[1].occupancy == 1 + assert channels[1].occupants[0].uuid == pubnub.uuid + + pubnub.unsubscribe().channels([ch1, ch2]).execute() + subscribe_listener.wait_for_disconnect() + + pubnub.stop() From 45ab30d408d81825d6c9399484d6c3346ed6f2d5 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 23 Jul 2016 10:03:19 -0700 Subject: [PATCH 219/468] Rename files herenow => here_now --- pubnub/endpoints/presence/{herenow.py => here_now.py} | 0 pubnub/pubnub_core.py | 2 +- tests/functional/{test_herenow.py => test_here_now.py} | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename pubnub/endpoints/presence/{herenow.py => here_now.py} (100%) rename tests/functional/{test_herenow.py => test_here_now.py} (96%) diff --git a/pubnub/endpoints/presence/herenow.py b/pubnub/endpoints/presence/here_now.py similarity index 100% rename from pubnub/endpoints/presence/herenow.py rename to pubnub/endpoints/presence/here_now.py diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index ee989bcc..381bed0f 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -15,7 +15,7 @@ from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.set_state import SetState from .endpoints.pubsub.publish import Publish -from .endpoints.presence.herenow import HereNow +from .endpoints.presence.here_now import HereNow from .endpoints.presence.where_now import WhereNow from .endpoints.push.add_channels_to_push import AddChannelsToPush diff --git a/tests/functional/test_herenow.py b/tests/functional/test_here_now.py similarity index 96% rename from tests/functional/test_herenow.py rename to tests/functional/test_here_now.py index c4e69829..b265d2d2 100644 --- a/tests/functional/test_herenow.py +++ b/tests/functional/test_here_now.py @@ -1,6 +1,6 @@ import unittest -from pubnub.endpoints.presence.herenow import HereNow +from pubnub.endpoints.presence.here_now import HereNow try: from mock import MagicMock From 2cc0c43de60f57c86d1cddd6955c1475270e5716 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 23 Jul 2016 10:57:44 -0700 Subject: [PATCH 220/468] Add functional pam CG tests --- tests/functional/test_audit.py | 65 ++++++++++++++++++++++++++++++++++ tests/functional/test_grant.py | 24 +++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 tests/functional/test_audit.py diff --git a/tests/functional/test_audit.py b/tests/functional/test_audit.py new file mode 100644 index 00000000..ab0d81f3 --- /dev/null +++ b/tests/functional/test_audit.py @@ -0,0 +1,65 @@ +import unittest + +from pubnub import utils +from pubnub.endpoints.access.audit import Audit + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf_pam, sdk_name + + +class TestAudit(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf_pam, + sdk_name=sdk_name, + timestamp=MagicMock(return_value=123), + uuid=None + ) + self.pubnub.uuid = "UUID_AuditUnitTest" + self.audit = Audit(self.pubnub) + + def test_audit_channel(self): + self.audit.channels('ch') + + self.assertEquals(self.audit.build_path(), Audit.AUDIT_PATH % pnconf_pam.subscribe_key) + + self.assertEqual(self.audit.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'timestamp': '123', + 'channel': 'ch', + 'signature': utils.sign_sha256(pnconf_pam.secret_key, + pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + "audit\n" + utils.prepare_pam_arguments({ + 'timestamp': 123, + 'channel': 'ch', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + })) + }) + + def test_audit_channel_group(self): + self.audit.channel_groups(['gr1', 'gr2']) + + self.assertEquals(self.audit.build_path(), Audit.AUDIT_PATH % pnconf_pam.subscribe_key) + + self.assertEqual(self.audit.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'timestamp': '123', + 'channel-group': 'gr1,gr2', + 'signature': utils.sign_sha256(pnconf_pam.secret_key, + pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + "audit\n" + utils.prepare_pam_arguments({ + 'timestamp': 123, + 'channel-group': 'gr1,gr2', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + })) + }) diff --git a/tests/functional/test_grant.py b/tests/functional/test_grant.py index f115a296..b92dceba 100644 --- a/tests/functional/test_grant.py +++ b/tests/functional/test_grant.py @@ -47,3 +47,27 @@ def test_grant_read_and_write_to_channel(self): 'uuid': self.pubnub.uuid })) }) + + def test_grant_read_and_write_to_channel_group(self): + self.grant.channel_groups(['gr1', 'gr2']).read(True).write(True) + + self.assertEquals(self.grant.build_path(), Grant.GRANT_PATH % pnconf_pam.subscribe_key) + + self.assertEqual(self.grant.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'r': '1', + 'w': '1', + 'timestamp': '123', + 'channel-group': 'gr1,gr2', + 'signature': utils.sign_sha256(pnconf_pam.secret_key, + pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + "grant\n" + utils.prepare_pam_arguments({ + 'r': '1', + 'w': '1', + 'timestamp': 123, + 'channel-group': 'gr1,gr2', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + })) + }) From 76bfa3dbc554e1f14e47a2a4b2cce020cea1c374 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 24 Jul 2016 03:03:46 -0700 Subject: [PATCH 221/468] Add asyncio pam CG tests --- pubnub/models/consumer/access_manager.py | 41 ++++++- tests/integrational/asyncio/test_pam.py | 140 ++++++++++++++++++++++- 2 files changed, 176 insertions(+), 5 deletions(-) diff --git a/pubnub/models/consumer/access_manager.py b/pubnub/models/consumer/access_manager.py index 5a96ee31..810dab21 100644 --- a/pubnub/models/consumer/access_manager.py +++ b/pubnub/models/consumer/access_manager.py @@ -33,8 +33,33 @@ def from_json(cls, json_input): ttl=ttl ) - if 'channel_groups' in json_input: - pass #TODO: implement + if 'channel-group' in json_input: + if isinstance(json_input['channel-group'], six.string_types): + group_name = json_input['channel-group'] + constructed_auth_keys = {} + for auth_key_name, value in six.iteritems(json_input['auths']): + constructed_auth_keys[auth_key_name] = PNAccessManagerKeyData.from_json(value) + constructed_groups[group_name] = PNAccessManagerChannelGroupData( + name=group_name, + auth_keys=constructed_auth_keys, + ttl=ttl + ) + + if 'channel-groups' in json_input: + if isinstance(json_input['channel-groups'], six.string_types): + group_name = json_input['channel-groups'] + constructed_auth_keys = {} + for auth_key_name, value in six.iteritems(json_input['auths']): + constructed_auth_keys[auth_key_name] = PNAccessManagerKeyData.from_json(value) + constructed_groups[group_name] = PNAccessManagerChannelGroupData( + name=group_name, + auth_keys=constructed_auth_keys, + ttl=ttl + ) + if isinstance(json_input['channel-groups'], dict): + for group_name, value in six.iteritems(json_input['channel-groups']): + constructed_groups[group_name] = \ + PNAccessManagerChannelGroupData.from_json(group_name, value) if 'channels' in json_input: for channel_name, value in six.iteritems(json_input['channels']): @@ -61,7 +86,7 @@ class PNAccessManagerGrantResult(_PAMResult): pass -class PNAccessManagerChannelData(object): +class _PAMEntityData(object): def __init__(self, name, auth_keys=None, r=None, w=None, m=None, ttl=None): self.name = name self.auth_keys = auth_keys @@ -79,7 +104,15 @@ def from_json(cls, name, json_input): for auth_key, value in json_input['auths'].items(): constructed_auth_keys[auth_key] = PNAccessManagerKeyData.from_json(value) - return PNAccessManagerChannelData(name, constructed_auth_keys, r, w, m) + return cls(name, constructed_auth_keys, r, w, m) + + +class PNAccessManagerChannelData(_PAMEntityData): + pass + + +class PNAccessManagerChannelGroupData(_PAMEntityData): + pass class PNAccessManagerKeyData(object): diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index 3d8ff5bd..e49dfdd4 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -134,7 +134,7 @@ async def test_multiple_channels(event_loop): @pytest.mark.asyncio -async def test_multiple_channels(event_loop): +async def test_multiple_channels_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" ch1 = helper.gen_channel("pam-channel") @@ -169,3 +169,141 @@ async def test_multiple_channels(event_loop): assert env.result.channels[ch2].auth_keys[auth].manage_enabled is False pubnub.stop() + + +@pytest.mark.asyncio +async def test_single_channel_group(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + cg = helper.gen_channel("pam-cg") + + env = (await pubnub.grant() + .channel_groups(cg) + .write(True) + .read(True) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.level == 'channel-group' + assert env.result.groups[cg].read_enabled == 1 + assert env.result.groups[cg].write_enabled == 1 + assert env.result.groups[cg].manage_enabled == 0 + + env = (await pubnub.audit() + .channel_groups(cg) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.level == 'channel-group' + assert env.result.groups[cg].read_enabled == 1 + assert env.result.groups[cg].write_enabled == 1 + assert env.result.groups[cg].manage_enabled == 0 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_single_channel_group_with_auth(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + gr = helper.gen_channel("pam-cg") + auth = helper.gen_channel("pam-auth-key") + + env = (await pubnub.grant() + .channel_groups(gr) + .write(True) + .read(True) + .auth_keys(auth) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.level == 'channel-group+auth' + assert env.result.groups[gr].auth_keys[auth].read_enabled == 1 + assert env.result.groups[gr].auth_keys[auth].write_enabled == 1 + assert env.result.groups[gr].auth_keys[auth].manage_enabled == 0 + + env = (await pubnub.audit() + .channel_groups(gr) + .auth_keys(auth) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.groups[gr].auth_keys[auth].read_enabled == 1 + assert env.result.groups[gr].auth_keys[auth].write_enabled == 1 + assert env.result.groups[gr].auth_keys[auth].manage_enabled == 0 + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channel_groups(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + gr1 = helper.gen_channel("pam-group1") + gr2 = helper.gen_channel("pam-group2") + + env = (await pubnub.grant() + .channel_groups([gr1, gr2]) + .write(True) + .read(True) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.groups[gr1].read_enabled is True + assert env.result.groups[gr2].read_enabled is True + assert env.result.groups[gr1].write_enabled is True + assert env.result.groups[gr2].write_enabled is True + assert env.result.groups[gr1].manage_enabled is False + assert env.result.groups[gr2].manage_enabled is False + + env = (await pubnub.audit() + .channel_groups([gr1, gr2]) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.groups[gr1].read_enabled is True + assert env.result.groups[gr2].read_enabled is True + assert env.result.groups[gr1].write_enabled is True + assert env.result.groups[gr2].write_enabled is True + assert env.result.groups[gr1].manage_enabled is False + assert env.result.groups[gr2].manage_enabled is False + + pubnub.stop() + + +@pytest.mark.asyncio +async def test_multiple_channel_groups_with_auth(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = "my_uuid" + gr1 = helper.gen_channel("pam-group1") + gr2 = helper.gen_channel("pam-group2") + auth = helper.gen_channel("pam-auth-key") + + env = (await pubnub.grant() + .channel_groups([gr1, gr2]) + .write(True) + .read(True) + .auth_keys(auth) + .future()) + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert env.result.groups[gr1].auth_keys[auth].read_enabled is True + assert env.result.groups[gr2].auth_keys[auth].read_enabled is True + assert env.result.groups[gr1].auth_keys[auth].write_enabled is True + assert env.result.groups[gr2].auth_keys[auth].write_enabled is True + assert env.result.groups[gr1].auth_keys[auth].manage_enabled is False + assert env.result.groups[gr2].auth_keys[auth].manage_enabled is False + + env = (await pubnub.audit() + .channel_groups([gr1, gr2]) + .future()) + + assert isinstance(env.result, PNAccessManagerAuditResult) + assert env.result.groups[gr1].auth_keys[auth].read_enabled is True + assert env.result.groups[gr2].auth_keys[auth].read_enabled is True + assert env.result.groups[gr1].auth_keys[auth].write_enabled is True + assert env.result.groups[gr2].auth_keys[auth].write_enabled is True + assert env.result.groups[gr1].auth_keys[auth].manage_enabled is False + assert env.result.groups[gr2].auth_keys[auth].manage_enabled is False + + pubnub.stop() From 691b93c9974c18fec73a21c634926ebcfcb43a8e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 24 Jul 2016 03:07:56 -0700 Subject: [PATCH 222/468] Cleanup audit endpoint --- pubnub/endpoints/access/audit.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pubnub/endpoints/access/audit.py b/pubnub/endpoints/access/audit.py index 1b196dc9..075a8903 100644 --- a/pubnub/endpoints/access/audit.py +++ b/pubnub/endpoints/access/audit.py @@ -2,10 +2,8 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_PAM_NO_FLAGS -from pubnub.exceptions import PubNubException from pubnub.enums import HttpMethod, PNOperationType -from pubnub.models.consumer.access_manager import PNAccessManagerGrantResult, PNAccessManagerAuditResult +from pubnub.models.consumer.access_manager import PNAccessManagerAuditResult class Audit(Endpoint): From d2c49ae38046bef38278b65e065f1c84caa7b8c1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 24 Jul 2016 03:54:50 -0700 Subject: [PATCH 223/468] Add python_v35 tornado async/await test --- scripts/run-tests.py | 8 +-- tests/integrational/python_v35/__init__.py | 0 .../test_tornado_async_await_syntax.py | 50 +++++++++++++++++++ 3 files changed, 54 insertions(+), 4 deletions(-) create mode 100644 tests/integrational/python_v35/__init__.py create mode 100644 tests/integrational/python_v35/test_tornado_async_await_syntax.py diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 0dc8515d..9f490f34 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -22,15 +22,15 @@ def run(command): return check_call(command, shell=True) if version.startswith('2.6'): - run('py.test --cov=../pubnub --ignore=integrational/tornado/ --ignore=integrational/twisted/ --ignore=integrational/asyncio/') + run('py.test --cov=../pubnub --ignore=integrational/tornado/ --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') elif version.startswith('2.7'): # TODO: remove twisted ignore option when the tests will be ready - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') elif version.startswith('3.3'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') elif version.startswith('3.4'): # TODO: rewrite asyncio SDK to support Python 3.4 - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') elif version.startswith('3.5'): run('py.test --cov=../pubnub --ignore=integrational/twisted/') elif version.startswith('3.6'): diff --git a/tests/integrational/python_v35/__init__.py b/tests/integrational/python_v35/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/python_v35/test_tornado_async_await_syntax.py b/tests/integrational/python_v35/test_tornado_async_await_syntax.py new file mode 100644 index 00000000..93eb0f6f --- /dev/null +++ b/tests/integrational/python_v35/test_tornado_async_await_syntax.py @@ -0,0 +1,50 @@ +import logging +import pytest +import sys +import tornado +import pubnub as pn + +from tornado.testing import AsyncTestCase +from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +class SubscriptionTest(object): + def __init__(self): + super(SubscriptionTest, self).__init__() + self.pubnub = None + self.pubnub_listener = None + + +class TestChannelSubscription(AsyncTestCase, SubscriptionTest): + def setUp(self): + super(TestChannelSubscription, self).setUp() + self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + + @tornado.testing.gen_test + async def test_subscribe_publish_unsubscribe(self): + ch = helper.gen_channel("subscribe-test") + message = "hey" + + callback_messages = SubscribeListener() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels(ch).execute() + await callback_messages.wait_for_connect() + + sub_env, pub_env = await tornado.gen.multi([ + callback_messages.wait_for_message_on(ch), + self.pubnub.publish().channel(ch).message(message).future()]) + + assert pub_env.status.original_response[0] == 1 + assert pub_env.status.original_response[1] == 'Sent' + + assert sub_env.actual_channel == ch + assert sub_env.subscribed_channel == ch + assert sub_env.message == message + + self.pubnub.unsubscribe().channels(ch).execute() + await callback_messages.wait_for_disconnect() From 7b6d78858064e910ffe8e9f2ffe6c7e9fc4aadc8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 24 Jul 2016 08:54:25 -0700 Subject: [PATCH 224/468] Add Asyncio Python v3.4 support --- pubnub/pubnub_asyncio.py | 54 ++++++++------ scripts/run-tests.py | 3 +- .../asyncio/test_channel_groups.py | 42 +++++------ tests/integrational/asyncio/test_heartbeat.py | 16 ++-- tests/integrational/asyncio/test_here_now.py | 30 ++++---- tests/integrational/asyncio/test_pam.py | 54 +++++++------- tests/integrational/asyncio/test_publish.py | 60 +++++++-------- tests/integrational/asyncio/test_state.py | 14 ++-- tests/integrational/asyncio/test_subscribe.py | 74 +++++++++---------- tests/integrational/asyncio/test_where_now.py | 20 ++--- .../test_asyncio_async_await_syntax.py | 50 +++++++++++++ 11 files changed, 239 insertions(+), 178 deletions(-) create mode 100644 tests/integrational/python_v35/test_asyncio_async_await_syntax.py diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 06431854..28dba4d7 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -63,7 +63,8 @@ def request_async(self, *args): def request_deferred(self, *args): raise NotImplementedError - async def request_future(self, intermediate_key_future, options_func, create_response, + @asyncio.coroutine + def request_future(self, intermediate_key_future, options_func, create_response, create_status_response, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -76,7 +77,7 @@ async def request_future(self, intermediate_key_future, options_func, create_res logger.debug("%s %s %s" % (options.method_string, log_url, options.data)) try: - response = await asyncio.wait_for( + response = yield from asyncio.wait_for( self._session.request(options.method_string, url, params=options.query_string, headers=self.headers, @@ -90,7 +91,7 @@ async def request_future(self, intermediate_key_future, options_func, create_res print('regular error', str(e)) raise - body = await response.text() + body = yield from response.text() if cancellation_event is not None and cancellation_event.is_set(): return @@ -207,10 +208,11 @@ def stop(self): if self._subscribe_loop_task is not None and not self._subscribe_loop_task.cancelled(): self._subscribe_loop_task.cancel() - async def _start_subscribe_loop(self): + @asyncio.coroutine + def _start_subscribe_loop(self): self._stop_subscribe_loop() - await self._subscription_lock.acquire() + yield from self._subscription_lock.acquire() combined_channels = self._subscription_state.prepare_channel_list(True) combined_groups = self._subscription_state.prepare_channel_group_list(True) @@ -227,7 +229,7 @@ async def _start_subscribe_loop(self): .filter_expression(self._pubnub.config.filter_expression) .future()) - envelope = await self._subscribe_request_task + envelope = yield from self._subscribe_request_task if self._subscribe_request_task.cancelled(): return @@ -265,7 +267,8 @@ def _register_heartbeat_timer(self): if not self._should_stop: self._heartbeat_periodic_callback.start() - async def _perform_heartbeat_loop(self): + @asyncio.coroutine + def _perform_heartbeat_loop(self): if self._heartbeat_call is not None: # TODO: cancel call pass @@ -286,7 +289,7 @@ async def _perform_heartbeat_loop(self): .cancellation_event(cancellation_event) .future()) - envelope = await heartbeat_call + envelope = yield from heartbeat_call heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: @@ -309,8 +312,9 @@ async def _perform_heartbeat_loop(self): def _send_leave(self, unsubscribe_operation): asyncio.ensure_future(self._send_leave_helper(unsubscribe_operation)) - async def _send_leave_helper(self, unsubscribe_operation): - envelope = await Leave(self._pubnub) \ + @asyncio.coroutine + def _send_leave_helper(self, unsubscribe_operation): + envelope = yield from Leave(self._pubnub) \ .channels(unsubscribe_operation.channels) \ .channel_groups(unsubscribe_operation.channel_groups).future() @@ -318,13 +322,15 @@ async def _send_leave_helper(self, unsubscribe_operation): class AsyncioSubscribeMessageWorker(SubscribeMessageWorker): - async def run(self): - await self._take_message() + @asyncio.coroutine + def run(self): + yield from self._take_message() - async def _take_message(self): + @asyncio.coroutine + def _take_message(self): while True: try: - msg = await self._queue.get() + msg = yield from self._queue.get() if msg is not None: self._process_incoming_payload(msg) self._queue.task_done() @@ -415,23 +421,26 @@ def message(self, pubnub, message): def presence(self, pubnub, presence): self.presence_queue.put_nowait(presence) - async def wait_for_connect(self): + @asyncio.coroutine + def wait_for_connect(self): if not self.connected_event.is_set(): - await self.connected_event.wait() + yield from self.connected_event.wait() else: raise Exception("instance is already connected") - async def wait_for_disconnect(self): + @asyncio.coroutine + def wait_for_disconnect(self): if not self.disconnected_event.is_set(): - await self.disconnected_event.wait() + yield from self.disconnected_event.wait() else: raise Exception("instance is already disconnected") - async def wait_for_message_on(self, *channel_names): + @asyncio.coroutine + def wait_for_message_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = await self.message_queue.get() + env = yield from self.message_queue.get() if env.actual_channel in channel_names: return env else: @@ -439,11 +448,12 @@ async def wait_for_message_on(self, *channel_names): finally: self.message_queue.task_done() - async def wait_for_presence_on(self, *channel_names): + @asyncio.coroutine + def wait_for_presence_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = await self.presence_queue.get() + env = yield from self.presence_queue.get() if env.actual_channel[:-7] in channel_names: return env else: diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 9f490f34..c8c0f9e2 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -29,8 +29,7 @@ def run(command): elif version.startswith('3.3'): run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') elif version.startswith('3.4'): - # TODO: rewrite asyncio SDK to support Python 3.4 - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/python_v35/') elif version.startswith('3.5'): run('py.test --cov=../pubnub --ignore=integrational/twisted/') elif version.startswith('3.6'): diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index 21a7b63d..45ad1fc0 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -9,36 +9,36 @@ @pytest.mark.asyncio -async def test_add_remove_single_channel(event_loop): +def test_add_remove_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) ch = helper.gen_channel("herenow-unit") gr = helper.gen_channel("herenow-unit") # add - env = await pubnub.add_channel_to_channel_group() \ + env = yield from pubnub.add_channel_to_channel_group() \ .channels(ch).channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsAddChannelResult) - await asyncio.sleep(1) + yield from asyncio.sleep(1) # list - env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsListResult) assert len(env.result.channels) == 1 assert env.result.channels[0] == ch # remove - env = await pubnub.remove_channel_from_channel_group() \ + env = yield from pubnub.remove_channel_from_channel_group() \ .channels(ch).channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) - await asyncio.sleep(1) + yield from asyncio.sleep(1) # list - env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsListResult) assert len(env.result.channels) == 0 @@ -46,7 +46,7 @@ async def test_add_remove_single_channel(event_loop): @pytest.mark.asyncio -async def test_add_remove_multiple_channels(event_loop): +def test_add_remove_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) ch1 = helper.gen_channel("herenow-unit") @@ -54,30 +54,30 @@ async def test_add_remove_multiple_channels(event_loop): gr = helper.gen_channel("herenow-unit") # add - env = await pubnub.add_channel_to_channel_group() \ + env = yield from pubnub.add_channel_to_channel_group() \ .channels([ch1, ch2]).channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsAddChannelResult) - await asyncio.sleep(1) + yield from asyncio.sleep(1) # list - env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsListResult) assert len(env.result.channels) == 2 assert ch1 in env.result.channels assert ch2 in env.result.channels # remove - env = await pubnub.remove_channel_from_channel_group() \ + env = yield from pubnub.remove_channel_from_channel_group() \ .channels([ch1, ch2]).channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) - await asyncio.sleep(1) + yield from asyncio.sleep(1) # list - env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsListResult) assert len(env.result.channels) == 0 @@ -85,35 +85,35 @@ async def test_add_remove_multiple_channels(event_loop): @pytest.mark.asyncio -async def test_add_channel_remove_group(event_loop): +def test_add_channel_remove_group(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) ch = helper.gen_channel("herenow-unit") gr = helper.gen_channel("herenow-unit") # add - env = await pubnub.add_channel_to_channel_group() \ + env = yield from pubnub.add_channel_to_channel_group() \ .channels(ch).channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsAddChannelResult) - await asyncio.sleep(1) + yield from asyncio.sleep(1) # list - env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsListResult) assert len(env.result.channels) == 1 assert env.result.channels[0] == ch # remove group - env = await pubnub.remove_channel_group().channel_group(gr).future() + env = yield from pubnub.remove_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsRemoveGroupResult) - await asyncio.sleep(1) + yield from asyncio.sleep(1) # list - env = await pubnub.list_channels_in_channel_group().channel_group(gr).future() + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsListResult) assert len(env.result.channels) == 0 diff --git a/tests/integrational/asyncio/test_heartbeat.py b/tests/integrational/asyncio/test_heartbeat.py index 35f3f903..e0ff4f07 100644 --- a/tests/integrational/asyncio/test_heartbeat.py +++ b/tests/integrational/asyncio/test_heartbeat.py @@ -19,7 +19,7 @@ @pytest.mark.asyncio -async def test_timeout_event_on_broken_heartbeat(event_loop): +def test_timeout_event_on_broken_heartbeat(event_loop): ch = helper.gen_channel("heartbeat-test") pubnub = PubNubAsyncio(messenger_config, custom_event_loop=event_loop) @@ -32,9 +32,9 @@ async def test_timeout_event_on_broken_heartbeat(event_loop): callback_presence = SubscribeListener() pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channels(ch).with_presence().execute() - await callback_presence.wait_for_connect() + yield from callback_presence.wait_for_connect() - envelope = await callback_presence.wait_for_presence_on(ch) + envelope = yield from callback_presence.wait_for_presence_on(ch) assert ch + "-pnpres" == envelope.actual_channel assert 'join' == envelope.event assert pubnub_listener.uuid == envelope.uuid @@ -48,7 +48,7 @@ async def test_timeout_event_on_broken_heartbeat(event_loop): presence_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) # - assert join event - await asyncio.wait([useless_connect_future, presence_future]) + yield from asyncio.wait([useless_connect_future, presence_future]) prs_envelope = presence_future.result() @@ -57,23 +57,23 @@ async def test_timeout_event_on_broken_heartbeat(event_loop): assert pubnub.uuid == prs_envelope.uuid # wait for one heartbeat call - await asyncio.sleep(8) + yield from asyncio.sleep(8) # - break messenger heartbeat loop pubnub._subscription_manager._stop_heartbeat_timer() # - assert for timeout - envelope = await callback_presence.wait_for_presence_on(ch) + envelope = yield from callback_presence.wait_for_presence_on(ch) assert ch + "-pnpres" == envelope.actual_channel assert 'timeout' == envelope.event assert pubnub.uuid == envelope.uuid pubnub.unsubscribe().channels(ch).execute() - await callback_messages.wait_for_disconnect() + yield from callback_messages.wait_for_disconnect() # - disconnect from :ch-pnpres pubnub_listener.unsubscribe().channels(ch).execute() - await callback_presence.wait_for_disconnect() + yield from callback_presence.wait_for_disconnect() pubnub.stop() pubnub_listener.stop() diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index 004cf754..8d25b760 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -7,7 +7,7 @@ @pytest.mark.asyncio -async def test_single_channel(event_loop): +def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) ch = helper.gen_channel("herenow-unit") @@ -15,11 +15,11 @@ async def test_single_channel(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels(ch).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() - await asyncio.sleep(2) + yield from asyncio.sleep(5) - env = await pubnub.here_now() \ + env = yield from pubnub.here_now() \ .channels(ch) \ .include_uuids(True) \ .future() @@ -34,13 +34,13 @@ async def test_single_channel(event_loop): assert channels[0].occupants[0].uuid == pubnub.uuid pubnub.unsubscribe().channels(ch).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() @pytest.mark.asyncio -async def test_multiple_channels(event_loop): +def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) ch1 = helper.gen_channel("here-now") @@ -50,10 +50,10 @@ async def test_multiple_channels(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels([ch1, ch2]).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() - await asyncio.sleep(4) - env = await pubnub.here_now() \ + yield from asyncio.sleep(5) + env = yield from pubnub.here_now() \ .channels([ch1, ch2]) \ .future() @@ -69,13 +69,13 @@ async def test_multiple_channels(event_loop): assert channels[1].occupants[0].uuid == pubnub.uuid pubnub.unsubscribe().channels([ch1, ch2]).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() @pytest.mark.asyncio -async def test_global(event_loop): +def test_global(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) ch1 = helper.gen_channel("here-now") @@ -85,16 +85,16 @@ async def test_global(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels([ch1, ch2]).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() - await asyncio.sleep(2) + yield from asyncio.sleep(5) - env = await pubnub.here_now().future() + env = yield from pubnub.here_now().future() assert env.result.total_channels >= 2 assert env.result.total_occupancy >= 1 pubnub.unsubscribe().channels([ch1, ch2]).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index e49dfdd4..b78870ac 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -7,11 +7,11 @@ @pytest.mark.asyncio -async def test_global_level(event_loop): +def test_global_level(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" - env = (await pubnub.grant() + env = (yield from pubnub.grant() .write(True) .read(True) .future()) @@ -23,7 +23,7 @@ async def test_global_level(event_loop): assert env.result.write_enabled is True assert env.result.manage_enabled is False - env = (await pubnub.audit() + env = (yield from pubnub.audit() .future()) assert isinstance(env.result, PNAccessManagerAuditResult) @@ -37,12 +37,12 @@ async def test_global_level(event_loop): @pytest.mark.asyncio -async def test_single_channel(event_loop): +def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" ch = helper.gen_channel("pam-channel") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channels(ch) .write(True) .read(True) @@ -53,7 +53,7 @@ async def test_single_channel(event_loop): assert env.result.channels[ch].write_enabled == 1 assert env.result.channels[ch].manage_enabled == 0 - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channels(ch) .future()) @@ -66,13 +66,13 @@ async def test_single_channel(event_loop): @pytest.mark.asyncio -async def test_single_channel_with_auth(event_loop): +def test_single_channel_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" ch = helper.gen_channel("pam-channel") auth = helper.gen_channel("pam-auth-key") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channels(ch) .write(True) .read(True) @@ -84,7 +84,7 @@ async def test_single_channel_with_auth(event_loop): assert env.result.channels[ch].auth_keys[auth].write_enabled == 1 assert env.result.channels[ch].auth_keys[auth].manage_enabled == 0 - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channels(ch) .auth_keys(auth) .future()) @@ -98,13 +98,13 @@ async def test_single_channel_with_auth(event_loop): @pytest.mark.asyncio -async def test_multiple_channels(event_loop): +def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" ch1 = helper.gen_channel("pam-channel") ch2 = helper.gen_channel("pam-channel") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channels([ch1, ch2]) .write(True) .read(True) @@ -118,7 +118,7 @@ async def test_multiple_channels(event_loop): assert env.result.channels[ch1].manage_enabled is False assert env.result.channels[ch2].manage_enabled is False - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channels([ch1, ch2]) .future()) @@ -134,14 +134,14 @@ async def test_multiple_channels(event_loop): @pytest.mark.asyncio -async def test_multiple_channels_with_auth(event_loop): +def test_multiple_channels_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" ch1 = helper.gen_channel("pam-channel") ch2 = helper.gen_channel("pam-channel") auth = helper.gen_channel("pam-auth-key") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channels([ch1, ch2]) .write(True) .read(True) @@ -156,7 +156,7 @@ async def test_multiple_channels_with_auth(event_loop): assert env.result.channels[ch1].auth_keys[auth].manage_enabled is False assert env.result.channels[ch2].auth_keys[auth].manage_enabled is False - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channels([ch1, ch2]) .future()) @@ -172,12 +172,12 @@ async def test_multiple_channels_with_auth(event_loop): @pytest.mark.asyncio -async def test_single_channel_group(event_loop): +def test_single_channel_group(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" cg = helper.gen_channel("pam-cg") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channel_groups(cg) .write(True) .read(True) @@ -189,7 +189,7 @@ async def test_single_channel_group(event_loop): assert env.result.groups[cg].write_enabled == 1 assert env.result.groups[cg].manage_enabled == 0 - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channel_groups(cg) .future()) @@ -203,13 +203,13 @@ async def test_single_channel_group(event_loop): @pytest.mark.asyncio -async def test_single_channel_group_with_auth(event_loop): +def test_single_channel_group_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" gr = helper.gen_channel("pam-cg") auth = helper.gen_channel("pam-auth-key") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channel_groups(gr) .write(True) .read(True) @@ -222,7 +222,7 @@ async def test_single_channel_group_with_auth(event_loop): assert env.result.groups[gr].auth_keys[auth].write_enabled == 1 assert env.result.groups[gr].auth_keys[auth].manage_enabled == 0 - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channel_groups(gr) .auth_keys(auth) .future()) @@ -236,13 +236,13 @@ async def test_single_channel_group_with_auth(event_loop): @pytest.mark.asyncio -async def test_multiple_channel_groups(event_loop): +def test_multiple_channel_groups(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" gr1 = helper.gen_channel("pam-group1") gr2 = helper.gen_channel("pam-group2") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channel_groups([gr1, gr2]) .write(True) .read(True) @@ -256,7 +256,7 @@ async def test_multiple_channel_groups(event_loop): assert env.result.groups[gr1].manage_enabled is False assert env.result.groups[gr2].manage_enabled is False - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channel_groups([gr1, gr2]) .future()) @@ -272,14 +272,14 @@ async def test_multiple_channel_groups(event_loop): @pytest.mark.asyncio -async def test_multiple_channel_groups_with_auth(event_loop): +def test_multiple_channel_groups_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" gr1 = helper.gen_channel("pam-group1") gr2 = helper.gen_channel("pam-group2") auth = helper.gen_channel("pam-auth-key") - env = (await pubnub.grant() + env = (yield from pubnub.grant() .channel_groups([gr1, gr2]) .write(True) .read(True) @@ -294,7 +294,7 @@ async def test_multiple_channel_groups_with_auth(event_loop): assert env.result.groups[gr1].auth_keys[auth].manage_enabled is False assert env.result.groups[gr2].auth_keys[auth].manage_enabled is False - env = (await pubnub.audit() + env = (yield from pubnub.audit() .channel_groups([gr1, gr2]) .future()) diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index 73b9ab61..5fe5d51f 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -17,8 +17,8 @@ @pytest.mark.asyncio -async def assert_success_await(pub): - envelope = await pub.future() +def assert_success_await(pub): + envelope = yield from pub.future() assert isinstance(envelope, AsyncioEnvelope) assert isinstance(envelope.result, PNPublishResult) @@ -28,27 +28,27 @@ async def assert_success_await(pub): @pytest.mark.asyncio -async def assert_client_side_error(pub, expected_err_msg): +def assert_client_side_error(pub, expected_err_msg): try: - await pub.future() + yield from pub.future() except PubNubException as e: assert expected_err_msg in str(e) @pytest.mark.asyncio -async def assert_success_publish_get(pubnub, msg): - await assert_success_await(pubnub.publish().channel(ch).message(msg)) +def assert_success_publish_get(pubnub, msg): + yield from assert_success_await(pubnub.publish().channel(ch).message(msg)) @pytest.mark.asyncio -async def assert_success_publish_post(pubnub, msg): - await assert_success_await(pubnub.publish().channel(ch).message(msg).use_post(True)) +def assert_success_publish_post(pubnub, msg): + yield from assert_success_await(pubnub.publish().channel(ch).message(msg).use_post(True)) @pytest.mark.asyncio -async def test_publish_string_via_get(event_loop): +def test_publish_string_via_get(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) - await asyncio.gather( + yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_get(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_get(pubnub, 5)), asyncio.ensure_future(assert_success_publish_get(pubnub, True)), @@ -57,9 +57,9 @@ async def test_publish_string_via_get(event_loop): @pytest.mark.asyncio -async def test_publish_string_via_post(event_loop): +def test_publish_string_via_post(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) - await asyncio.gather( + yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_post(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_post(pubnub, 5)), asyncio.ensure_future(assert_success_publish_post(pubnub, True)), @@ -68,9 +68,9 @@ async def test_publish_string_via_post(event_loop): @pytest.mark.asyncio -async def test_publish_string_via_get_encrypted(event_loop): +def test_publish_string_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) - await asyncio.gather( + yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_get(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_get(pubnub, 5)), asyncio.ensure_future(assert_success_publish_get(pubnub, True)), @@ -79,9 +79,9 @@ async def test_publish_string_via_get_encrypted(event_loop): @pytest.mark.asyncio -async def test_publish_string_via_post_encrypted(event_loop): +def test_publish_string_via_post_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) - await asyncio.gather( + yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_post(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_post(pubnub, 5)), asyncio.ensure_future(assert_success_publish_post(pubnub, True)), @@ -90,51 +90,51 @@ async def test_publish_string_via_post_encrypted(event_loop): @pytest.mark.asyncio -async def test_error_missing_message(event_loop): +def test_error_missing_message(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) - await assert_client_side_error(pubnub.publish().channel(ch).message(None), "Message missing") + yield from assert_client_side_error(pubnub.publish().channel(ch).message(None), "Message missing") @pytest.mark.asyncio -async def test_error_missing_channel(event_loop): +def test_error_missing_channel(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) - await assert_client_side_error(pubnub.publish().channel("").message("hey"), "Channel missing") + yield from assert_client_side_error(pubnub.publish().channel("").message("hey"), "Channel missing") @pytest.mark.asyncio -async def test_error_non_serializable(event_loop): +def test_error_non_serializable(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) def method(): pass - await assert_client_side_error(pubnub.publish().channel(ch).message(method), "not JSON serializable") + yield from assert_client_side_error(pubnub.publish().channel(ch).message(method), "not JSON serializable") @pytest.mark.asyncio -async def test_publish_with_meta(event_loop): +def test_publish_with_meta(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) - await assert_success_await(pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + yield from assert_success_await(pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) @pytest.mark.asyncio -async def test_publish_do_not_store(event_loop): +def test_publish_do_not_store(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) - await assert_success_await(pubnub.publish().channel(ch).message("hey").should_store(False)) + yield from assert_success_await(pubnub.publish().channel(ch).message("hey").should_store(False)) @pytest.mark.asyncio -async def assert_server_side_error_yield(pub, expected_err_msg): +def assert_server_side_error_yield(pub, expected_err_msg): try: - await pub.future() + yield from pub.future() except PubNubAsyncioException as e: assert expected_err_msg in str(e) @pytest.mark.asyncio -async def test_error_invalid_key(event_loop): +def test_error_invalid_key(event_loop): conf = PNConfiguration() conf.publish_key = "fake" conf.subscribe_key = "demo" @@ -142,5 +142,5 @@ async def test_error_invalid_key(event_loop): pubnub = PubNubAsyncio(conf, custom_event_loop=event_loop) - await assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "Invalid Key") + yield from assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "Invalid Key") diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index ac205a2a..302c253c 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -1,3 +1,5 @@ +import asyncio + import pytest from pubnub.pubnub_asyncio import PubNubAsyncio @@ -6,12 +8,12 @@ @pytest.mark.asyncio -async def test_single_channel(event_loop): +def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) ch = helper.gen_channel("herenow-unit") state = {"name": "Alex", "count": 5} - env = await pubnub.set_state() \ + env = yield from pubnub.set_state() \ .channels(ch) \ .state(state) \ .future() @@ -19,7 +21,7 @@ async def test_single_channel(event_loop): assert env.result.state['name'] == "Alex" assert env.result.state['count'] == 5 - env = await pubnub.get_state() \ + env = yield from pubnub.get_state() \ .channels(ch) \ .future() @@ -30,13 +32,13 @@ async def test_single_channel(event_loop): @pytest.mark.asyncio -async def test_multiple_channels(event_loop): +def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) ch1 = helper.gen_channel("herenow-unit") ch2 = helper.gen_channel("herenow-unit") state = {"name": "Alex", "count": 5} - env = await pubnub.set_state() \ + env = yield from pubnub.set_state() \ .channels([ch1, ch2]) \ .state(state) \ .future() @@ -44,7 +46,7 @@ async def test_multiple_channels(event_loop): assert env.result.state['name'] == "Alex" assert env.result.state['count'] == 5 - env = await pubnub.get_state() \ + env = yield from pubnub.get_state() \ .channels([ch1, ch2]) \ .future() diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 07a789e4..f9b3fda4 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -12,7 +12,7 @@ @pytest.mark.asyncio -async def test_subscribe_unsubscribe(event_loop): +def test_subscribe_unsubscribe(event_loop): channel = helper.gen_channel("test-sub-unsub") pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -21,16 +21,16 @@ async def test_subscribe_unsubscribe(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() pubnub.unsubscribe().channels(channel).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() @pytest.mark.asyncio -async def test_subscribe_publish_unsubscribe(event_loop): +def test_subscribe_publish_unsubscribe(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) callback = SubscribeListener() @@ -39,12 +39,12 @@ async def test_subscribe_publish_unsubscribe(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() publish_future = asyncio.ensure_future(pubnub.publish().channel(channel).message(message).future()) subscribe_message_future = asyncio.ensure_future(callback.wait_for_message_on(channel)) - await asyncio.wait([ + yield from asyncio.wait([ publish_future, subscribe_message_future ]) @@ -63,13 +63,13 @@ async def test_subscribe_publish_unsubscribe(event_loop): assert publish_envelope.status.original_response[0] == 1 pubnub.unsubscribe().channels(channel).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() @pytest.mark.asyncio -async def test_join_leave(event_loop): +def test_join_leave(event_loop): channel = helper.gen_channel("test-subscribe-join-leave") presence_channel = "%s-pnpres" % channel @@ -85,84 +85,84 @@ async def test_join_leave(event_loop): pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channels(channel).with_presence().execute() - await callback_presence.wait_for_connect() + yield from callback_presence.wait_for_connect() - envelope = await callback_presence.wait_for_presence_on(channel) + envelope = yield from callback_presence.wait_for_presence_on(channel) assert envelope.actual_channel == presence_channel assert envelope.event == 'join' assert envelope.uuid == pubnub_listener.uuid pubnub.add_listener(callback_messages) pubnub.subscribe().channels(channel).execute() - await callback_messages.wait_for_connect() + yield from callback_messages.wait_for_connect() - envelope = await callback_presence.wait_for_presence_on(channel) + envelope = yield from callback_presence.wait_for_presence_on(channel) assert envelope.actual_channel == presence_channel assert envelope.event == 'join' assert envelope.uuid == pubnub.uuid pubnub.unsubscribe().channels(channel).execute() - await callback_messages.wait_for_disconnect() + yield from callback_messages.wait_for_disconnect() - envelope = await callback_presence.wait_for_presence_on(channel) + envelope = yield from callback_presence.wait_for_presence_on(channel) assert envelope.actual_channel == presence_channel assert envelope.event == 'leave' assert envelope.uuid == pubnub.uuid pubnub_listener.unsubscribe().channels(channel).execute() - await callback_presence.wait_for_disconnect() + yield from callback_presence.wait_for_disconnect() pubnub.stop() pubnub_listener.stop() @pytest.mark.asyncio -async def test_cg_subscribe_unsubscribe(event_loop): +def test_cg_subscribe_unsubscribe(event_loop): ch = helper.gen_channel("test-subscribe-unsubscribe-channel") gr = helper.gen_channel("test-subscribe-unsubscribe-group") pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - envelope = await pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - await asyncio.sleep(1) + yield from asyncio.sleep(1) callback_messages = SubscribeListener() pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() - await callback_messages.wait_for_connect() + yield from callback_messages.wait_for_connect() pubnub.unsubscribe().channel_groups(gr).execute() - await callback_messages.wait_for_disconnect() + yield from callback_messages.wait_for_disconnect() - envelope = await pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 pubnub.stop() @pytest.mark.asyncio -async def test_cg_subscribe_publish_unsubscribe(event_loop): +def test_cg_subscribe_publish_unsubscribe(event_loop): ch = helper.gen_channel("test-subscribe-unsubscribe-channel") gr = helper.gen_channel("test-subscribe-unsubscribe-group") message = "hey" pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - envelope = await pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - await asyncio.sleep(1) + yield from asyncio.sleep(1) callback_messages = SubscribeListener() pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() - await callback_messages.wait_for_connect() + yield from callback_messages.wait_for_connect() subscribe_future = asyncio.ensure_future(callback_messages.wait_for_message_on(ch)) publish_future = asyncio.ensure_future(pubnub.publish().channel(ch).message(message).future()) - await asyncio.wait([subscribe_future, publish_future]) + yield from asyncio.wait([subscribe_future, publish_future]) sub_envelope = subscribe_future.result() pub_envelope = publish_future.result() @@ -175,16 +175,16 @@ async def test_cg_subscribe_publish_unsubscribe(event_loop): assert sub_envelope.message == message pubnub.unsubscribe().channel_groups(gr).execute() - await callback_messages.wait_for_disconnect() + yield from callback_messages.wait_for_disconnect() - envelope = await pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 pubnub.stop() @pytest.mark.asyncio -async def test_cg_join_leave(event_loop): +def test_cg_join_leave(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -194,19 +194,19 @@ async def test_cg_join_leave(event_loop): ch = helper.gen_channel("test-subscribe-unsubscribe-channel") gr = helper.gen_channel("test-subscribe-unsubscribe-group") - envelope = await pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() + envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - await asyncio.sleep(1) + yield from asyncio.sleep(1) callback_messages = SubscribeListener() callback_presence = SubscribeListener() pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() - await callback_presence.wait_for_connect() + yield from callback_presence.wait_for_connect() - prs_envelope = await callback_presence.wait_for_presence_on(ch) + prs_envelope = yield from callback_presence.wait_for_presence_on(ch) assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub_listener.uuid assert prs_envelope.actual_channel == ch + "-pnpres" @@ -217,7 +217,7 @@ async def test_cg_join_leave(event_loop): callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_connect()) presence_messages_future= asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) - await asyncio.wait([callback_messages_future, presence_messages_future]) + yield from asyncio.wait([callback_messages_future, presence_messages_future]) prs_envelope = presence_messages_future.result() assert prs_envelope.event == 'join' @@ -229,7 +229,7 @@ async def test_cg_join_leave(event_loop): callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_disconnect()) presence_messages_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) - await asyncio.wait([callback_messages_future, presence_messages_future]) + yield from asyncio.wait([callback_messages_future, presence_messages_future]) prs_envelope = presence_messages_future.result() assert prs_envelope.event == 'leave' @@ -238,9 +238,9 @@ async def test_cg_join_leave(event_loop): assert prs_envelope.subscribed_channel == gr + "-pnpres" pubnub_listener.unsubscribe().channel_groups(gr).execute() - await callback_presence.wait_for_disconnect() + yield from callback_presence.wait_for_disconnect() - envelope = await pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 pubnub.stop() diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index ddf3be72..39fd0ddf 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -7,7 +7,7 @@ @pytest.mark.asyncio -async def test_single_channel(event_loop): +def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) ch = helper.gen_channel("wherenow-asyncio-channel") uuid = helper.gen_channel("wherenow-asyncio-uuid") @@ -17,11 +17,11 @@ async def test_single_channel(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels(ch).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() - await asyncio.sleep(2) + yield from asyncio.sleep(2) - env = await pubnub.where_now() \ + env = yield from pubnub.where_now() \ .uuid(uuid) \ .future() @@ -31,13 +31,13 @@ async def test_single_channel(event_loop): assert channels[0] == ch pubnub.unsubscribe().channels(ch).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() @pytest.mark.asyncio -async def test_multiple_channels(event_loop): +def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) ch1 = helper.gen_channel("here-now") @@ -49,11 +49,11 @@ async def test_multiple_channels(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels([ch1, ch2]).execute() - await callback.wait_for_connect() + yield from callback.wait_for_connect() - await asyncio.sleep(5) + yield from asyncio.sleep(5) - env = await pubnub.where_now() \ + env = yield from pubnub.where_now() \ .uuid(uuid) \ .future() @@ -64,6 +64,6 @@ async def test_multiple_channels(event_loop): assert ch2 in channels pubnub.unsubscribe().channels([ch1, ch2]).execute() - await callback.wait_for_disconnect() + yield from callback.wait_for_disconnect() pubnub.stop() diff --git a/tests/integrational/python_v35/test_asyncio_async_await_syntax.py b/tests/integrational/python_v35/test_asyncio_async_await_syntax.py new file mode 100644 index 00000000..0053b66d --- /dev/null +++ b/tests/integrational/python_v35/test_asyncio_async_await_syntax.py @@ -0,0 +1,50 @@ +import asyncio +import logging +import pytest +import pubnub as pn + +from pubnub.models.consumer.pubsub import PNMessageResult +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener +from tests import helper +from tests.helper import pnconf_sub_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +@pytest.mark.asyncio +async def test_subscribe_publish_unsubscribe(event_loop): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + callback = SubscribeListener() + channel = helper.gen_channel("test-sub-pub-unsub") + message = "hey" + pubnub.add_listener(callback) + pubnub.subscribe().channels(channel).execute() + + await callback.wait_for_connect() + + publish_future = asyncio.ensure_future(pubnub.publish().channel(channel).message(message).future()) + subscribe_message_future = asyncio.ensure_future(callback.wait_for_message_on(channel)) + + await asyncio.wait([ + publish_future, + subscribe_message_future + ]) + + publish_envelope = publish_future.result() + subscribe_envelope = subscribe_message_future.result() + + assert isinstance(subscribe_envelope, PNMessageResult) + assert subscribe_envelope.actual_channel == channel + assert subscribe_envelope.subscribed_channel == channel + assert subscribe_envelope.message == message + assert subscribe_envelope.timetoken > 0 + + assert isinstance(publish_envelope, AsyncioEnvelope) + assert publish_envelope.result.timetoken > 0 + assert publish_envelope.status.original_response[0] == 1 + + pubnub.unsubscribe().channels(channel).execute() + await callback.wait_for_disconnect() + + pubnub.stop() From a2379e378d338223b35e5e429dfaba145614cd8b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 25 Jul 2016 00:47:47 -0700 Subject: [PATCH 225/468] Add a basic history implementation --- pubnub/endpoints/endpoint.py | 6 +- pubnub/endpoints/history.py | 98 ++++++++++++++++++++++++++++++ pubnub/endpoints/pubsub/publish.py | 3 +- tests/functional/test_history.py | 49 +++++++++++++++ 4 files changed, 153 insertions(+), 3 deletions(-) create mode 100644 pubnub/endpoints/history.py create mode 100644 tests/functional/test_history.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 923365fa..fdf104bb 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -3,7 +3,7 @@ from pubnub import utils from pubnub.enums import PNStatusCategory from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING, \ - PNERR_SECRET_KEY_MISSING + PNERR_SECRET_KEY_MISSING, PNERR_CHANNEL_MISSING from pubnub.exceptions import PubNubException from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pn_error_data import PNErrorData @@ -134,6 +134,10 @@ def validate_secret_key(self): if self.pubnub.config.secret_key is None or len(self.pubnub.config.secret_key) == 0: raise PubNubException(pn_error=PNERR_SECRET_KEY_MISSING) + def validate_channel(self): + if self._channel is None or len(self._channel) is 0: + raise PubNubException(pn_error=PNERR_CHANNEL_MISSING) + def validate_channels_and_groups(self): if len(self._channels) == 0 and len(self._groups) == 0: raise PubNubException(pn_error=PNERR_CHANNEL_OR_GROUP_MISSING) diff --git a/pubnub/endpoints/history.py b/pubnub/endpoints/history.py new file mode 100644 index 00000000..83bf6746 --- /dev/null +++ b/pubnub/endpoints/history.py @@ -0,0 +1,98 @@ +import six + +from pubnub import utils +from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod, PNOperationType + + +class History(Endpoint): + HISTORY_PATH = "v2/history/sub-key/%s/channel/%s" + MAX_COUNT = 100 + + def __init__(self, pubnub): + Endpoint.__init__(self, pubnub) + self._channel = None + self._start = None + self._end = None + self._reverse = None + self._count = None + self._include_timetoken = None + + def channel(self, channel): + self._channel = channel + return self + + def start(self, start): + assert isinstance(start, six.integer_types) + self._start = start + return self + + def end(self, end): + assert isinstance(end, six.integer_types) + self._end = end + return self + + def reverse(self, reverse): + assert isinstance(reverse, bool) + self._reverse = reverse + return self + + def count(self, count): + assert isinstance(count, six.integer_types) + self._count = count + return self + + def include_timetoken(self, include_timetoken): + assert isinstance(include_timetoken, bool) + self._include_timetoken = include_timetoken + return self + + def build_params(self): + params = self.default_params() + + if self._start is not None: + params['start'] = str(self._start) + + if self._end is not None: + params['end'] = str(self._end) + + if self._count is not None and 0 < self._count <= History.MAX_COUNT: + params['count'] = str(self._count) + else: + params['count'] = '100' + + if self._reverse is not None: + params['reverse'] = "true" if self._reverse else "false" + + if self._include_timetoken is not None: + params['include_token'] = "true" if self._include_timetoken else "false" + + return params + + def build_path(self): + return History.HISTORY_PATH % ( + self.pubnub.config.subscribe_key, + utils.url_encode(self._channel) + ) + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + self.validate_subscribe_key() + self.validate_channel() + + def create_response(self, envelope): + pass + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNHistoryOperation + + def name(self): + return "History" diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index e4aa611f..965e781f 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -95,8 +95,7 @@ def http_method(self): return HttpMethod.GET def validate_params(self): - if self._channel is None or len(self._channel) is 0: - raise PubNubException(pn_error=PNERR_CHANNEL_MISSING) + self.validate_channel() if self._message is None: raise PubNubException(pn_error=PNERR_MESSAGE_MISSING) diff --git a/tests/functional/test_history.py b/tests/functional/test_history.py new file mode 100644 index 00000000..e6002cf0 --- /dev/null +++ b/tests/functional/test_history.py @@ -0,0 +1,49 @@ +import unittest + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.endpoints.history import History +from pubnub.pubnub import PubNub +from tests.helper import pnconf_pam, sdk_name + + +class TestHistory(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf_pam, + sdk_name=sdk_name, + timestamp=MagicMock(return_value=123), + uuid=None + ) + self.pubnub.uuid = "UUID_UnitTest" + self.history = History(self.pubnub) + + def test_history_basic(self): + self.history.channel('ch') + + self.assertEquals(self.history.build_path(), History.HISTORY_PATH % (pnconf_pam.subscribe_key, 'ch')) + + self.assertEqual(self.history.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'count': '100' + }) + + def test_history_full(self): + self.history.channel('ch').start(100000).end(200000).reverse(False).count(3).include_timetoken(True) + + self.assertEquals(self.history.build_path(), History.HISTORY_PATH % (pnconf_pam.subscribe_key, 'ch')) + + self.assertEqual(self.history.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'count': '3', + 'start': '100000', + 'end': '200000', + 'reverse': 'false', + 'include_token': 'true' + }) From cd9fc04300d649f5461c99ecc6c2f3197ba0c310 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 25 Jul 2016 08:43:48 -0700 Subject: [PATCH 226/468] Add history native/sync tests --- pubnub/endpoints/history.py | 5 +- pubnub/endpoints/pubsub/publish.py | 2 +- pubnub/models/consumer/history.py | 43 ++++++ pubnub/pubnub_core.py | 5 + .../fixtures/native_sync/history/basic.yaml | 125 ++++++++++++++++++ .../integrational/native_sync/test_history.py | 42 ++++++ 6 files changed, 219 insertions(+), 3 deletions(-) create mode 100644 pubnub/models/consumer/history.py create mode 100644 tests/integrational/fixtures/native_sync/history/basic.yaml create mode 100644 tests/integrational/native_sync/test_history.py diff --git a/pubnub/endpoints/history.py b/pubnub/endpoints/history.py index 83bf6746..86cf690a 100644 --- a/pubnub/endpoints/history.py +++ b/pubnub/endpoints/history.py @@ -3,10 +3,11 @@ from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.history import PNHistoryResult class History(Endpoint): - HISTORY_PATH = "v2/history/sub-key/%s/channel/%s" + HISTORY_PATH = "/v2/history/sub-key/%s/channel/%s" MAX_COUNT = 100 def __init__(self, pubnub): @@ -83,7 +84,7 @@ def validate_params(self): self.validate_channel() def create_response(self, envelope): - pass + return PNHistoryResult.from_json(envelope) def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 965e781f..1249199c 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -1,7 +1,7 @@ from pubnub import utils from pubnub import crypto as pn_crypto from pubnub.endpoints.endpoint import Endpoint -from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING +from pubnub.errors import PNERR_MESSAGE_MISSING from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.enums import HttpMethod, PNOperationType diff --git a/pubnub/models/consumer/history.py b/pubnub/models/consumer/history.py new file mode 100644 index 00000000..af8f4cb2 --- /dev/null +++ b/pubnub/models/consumer/history.py @@ -0,0 +1,43 @@ +from pubnub import crypto as pn_crypto + +class PNHistoryResult(object): + def __init__(self, messages, start_timetoken, end_timetoken): + self.messages = messages + self.start_timetoken = start_timetoken + self.end_timetoken = end_timetoken + + @classmethod + def from_json(cls, json_input, include_tt_option=False, cypher=None): + assert isinstance(include_tt_option, bool) + start_timetoken = json_input[1] + end_timetoken = json_input[2] + + raw_items = json_input[0] + messages = [] + + for item in raw_items: + if isinstance(item, dict) and 'timetoken' in item and 'message' in item and include_tt_option: + message = PNHistoryItemResult(item['message'], item['timetoken']) + else: + message = PNHistoryItemResult(item) + + if cypher is not None: + message.decrypt(cypher) + + messages.append(message) + + return PNHistoryResult( + messages=messages, + start_timetoken=start_timetoken, + end_timetoken=end_timetoken + ) + + +class PNHistoryItemResult(object): + def __init__(self, entry, timetoken=None): + self.timetoken = timetoken + self.entry = entry + + def decrypt(self, cypher_key): + self.entry = pn_crypto.decrypt(cypher_key, self.entry) + diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 381bed0f..968b189c 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -3,6 +3,7 @@ from abc import ABCMeta, abstractmethod +from pubnub.endpoints.history import History from .endpoints.access.audit import Audit from .endpoints.access.grant import Grant from .builders import SubscribeBuilder @@ -116,5 +117,9 @@ def remove_channels_from_push(self): def remove_device_from_push(self): return RemoveDeviceFromPush(self) + def history(self): + return History(self) + def timestamp(self): + """ Make static """ return int(time.time()) diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml new file mode 100644 index 00000000..9b849fef --- /dev/null +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -0,0 +1,125 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14694610268707663"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Mon, 25 Jul 2016 15:37:06 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.0&seqn=2 + response: + body: {string: '[1,"Sent","14694610269494321"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Mon, 25 Jul 2016 15:37:06 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.0&seqn=3 + response: + body: {string: '[1,"Sent","14694610270571781"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Mon, 25 Jul 2016 15:37:07 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.0&seqn=4 + response: + body: {string: '[1,"Sent","14694610271664959"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Mon, 25 Jul 2016 15:37:07 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.0&seqn=5 + response: + body: {string: '[1,"Sent","14694610272640835"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Mon, 25 Jul 2016 15:37:07 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14694610268707663,14694610272640835]'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Mon, 25 Jul 2016 15:37:12 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py new file mode 100644 index 00000000..cbf5ee09 --- /dev/null +++ b/tests/integrational/native_sync/test_history.py @@ -0,0 +1,42 @@ +import unittest +import logging +import time +import pubnub + +from pubnub.models.consumer.history import PNHistoryResult +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pubnub import PubNub +from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + +COUNT = 5 + + +class TestPubNubState(unittest.TestCase): + @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/history/basic.yaml', + filter_query_parameters=['uuid']) + def test_basic(self): + ch = "history-native-sync-ch" + pubnub = PubNub(pnconf_copy()) + pubnub.config.uuid = "history-native-sync-uuid" + + for i in range(COUNT): + result = pubnub.publish().channel(ch).message("hey-%s" % i).sync() + assert isinstance(result, PNPublishResult) + assert result.timetoken > 0 + + time.sleep(5) + + result = pubnub.history().channel(ch).count(COUNT).sync() + + assert isinstance(result, PNHistoryResult) + assert result.start_timetoken > 0 + assert result.end_timetoken > 0 + assert len(result.messages) == 5 + + assert result.messages[0].entry == 'hey-0' + assert result.messages[1].entry == 'hey-1' + assert result.messages[2].entry == 'hey-2' + assert result.messages[3].entry == 'hey-3' + assert result.messages[4].entry == 'hey-4' From 1757167e35e83285148d1819524885c11730c954 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 26 Jul 2016 02:19:29 -0700 Subject: [PATCH 227/468] Fix AES encryption --- pubnub/crypto.py | 18 ++++++++++++------ tests/unit/test_crypto.py | 20 ++++++++++++++++++++ 2 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 tests/unit/test_crypto.py diff --git a/pubnub/crypto.py b/pubnub/crypto.py index 5054cd16..b993e331 100644 --- a/pubnub/crypto.py +++ b/pubnub/crypto.py @@ -1,8 +1,9 @@ import hashlib +import json +from json import JSONDecodeError from Crypto.Cipher import AES -from base64 import encodestring, decodestring -from base64 import urlsafe_b64encode +from base64 import decodebytes, encodebytes import sys @@ -45,9 +46,9 @@ def encrypt(key, msg): secret = get_secret(key) cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) if v == 3: - return encodestring(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") + return encodebytes(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") else: - return encodestring(cipher.encrypt(pad(msg))).replace("\n", "") + return encodebytes(cipher.encrypt(pad(msg))).replace("\n", "") def decrypt(key, msg): @@ -55,6 +56,11 @@ def decrypt(key, msg): cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) if v == 3: - return (cipher.decrypt(decodestring(msg.encode('utf-8')))).decode('utf-8') + plain = depad((cipher.decrypt(decodebytes(msg.encode('utf-8')))).decode('utf-8')) else: - return depad(cipher.decrypt(decodestring(msg))) + plain = depad(cipher.decrypt(decodebytes(msg))) + + try: + return json.loads(plain) + except (JSONDecodeError, SyntaxError): + return plain diff --git a/tests/unit/test_crypto.py b/tests/unit/test_crypto.py new file mode 100644 index 00000000..270030f1 --- /dev/null +++ b/tests/unit/test_crypto.py @@ -0,0 +1,20 @@ +import unittest + +from pubnub import crypto + +todecode = 'QfD1NCBJCmt1aPPGU2cshw==' +key = 'testKey' + + +class TestDecode(unittest.TestCase): + def test_decode_aes(self): + hey = """ + + dfjn + t564 + + sdfhp\n + """ + + assert crypto.decrypt(key, crypto.encrypt(key, hey)) == hey + assert crypto.decrypt(key, todecode) == "hey-0" From 48dbb28ed3ab2b20d2562eea8993a34c4856f59f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 26 Jul 2016 02:48:13 -0700 Subject: [PATCH 228/468] Done with history native tests --- pubnub/endpoints/history.py | 2 +- pubnub/endpoints/pubsub/publish.py | 2 - pubnub/models/consumer/history.py | 12 +- tests/helper.py | 4 + .../fixtures/native_sync/history/encoded.yaml | 125 ++++++++++++++++++ .../integrational/native_sync/test_history.py | 29 +++- 6 files changed, 164 insertions(+), 10 deletions(-) create mode 100644 tests/integrational/fixtures/native_sync/history/encoded.yaml diff --git a/pubnub/endpoints/history.py b/pubnub/endpoints/history.py index 86cf690a..6b012352 100644 --- a/pubnub/endpoints/history.py +++ b/pubnub/endpoints/history.py @@ -84,7 +84,7 @@ def validate_params(self): self.validate_channel() def create_response(self, envelope): - return PNHistoryResult.from_json(envelope) + return PNHistoryResult.from_json(envelope, self._include_timetoken, self.pubnub.config.cipher_key) def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 1249199c..01cf1891 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -103,8 +103,6 @@ def validate_params(self): self.validate_subscribe_key() self.validate_publish_key() - pass - def create_response(self, envelope): """ :param envelope: an already serialized json response diff --git a/pubnub/models/consumer/history.py b/pubnub/models/consumer/history.py index af8f4cb2..66ddc201 100644 --- a/pubnub/models/consumer/history.py +++ b/pubnub/models/consumer/history.py @@ -1,5 +1,6 @@ from pubnub import crypto as pn_crypto + class PNHistoryResult(object): def __init__(self, messages, start_timetoken, end_timetoken): self.messages = messages @@ -7,8 +8,7 @@ def __init__(self, messages, start_timetoken, end_timetoken): self.end_timetoken = end_timetoken @classmethod - def from_json(cls, json_input, include_tt_option=False, cypher=None): - assert isinstance(include_tt_option, bool) + def from_json(cls, json_input, include_tt_option=False, cipher=None): start_timetoken = json_input[1] end_timetoken = json_input[2] @@ -21,8 +21,8 @@ def from_json(cls, json_input, include_tt_option=False, cypher=None): else: message = PNHistoryItemResult(item) - if cypher is not None: - message.decrypt(cypher) + if cipher is not None: + message.decrypt(cipher) messages.append(message) @@ -38,6 +38,6 @@ def __init__(self, entry, timetoken=None): self.timetoken = timetoken self.entry = entry - def decrypt(self, cypher_key): - self.entry = pn_crypto.decrypt(cypher_key, self.entry) + def decrypt(self, cipher_key): + self.entry = pn_crypto.decrypt(cipher_key, self.entry) diff --git a/tests/helper.py b/tests/helper.py index 6f765dc3..b3659d35 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -53,6 +53,10 @@ def pnconf_copy(): return copy(pnconf) +def pnconf_enc_copy(): + return copy(pnconf_enc) + + def pnconf_sub_copy(): return copy(pnconf_sub) diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml new file mode 100644 index 00000000..e682296f --- /dev/null +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -0,0 +1,125 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14695248164027962"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=2 + response: + body: {string: '[1,"Sent","14695248165146799"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=3 + response: + body: {string: '[1,"Sent","14695248166152452"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=4 + response: + body: {string: '[1,"Sent","14695248167059434"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=5 + response: + body: {string: '[1,"Sent","14695248167891717"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14695248164027962,14695248167891717]'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['174'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Tue, 26 Jul 2016 09:20:21 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index cbf5ee09..8db2a4fc 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -6,7 +6,7 @@ from pubnub.models.consumer.history import PNHistoryResult from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep +from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep, pnconf_enc_copy pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -40,3 +40,30 @@ def test_basic(self): assert result.messages[2].entry == 'hey-2' assert result.messages[3].entry == 'hey-3' assert result.messages[4].entry == 'hey-4' + + @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/history/encoded.yaml', + filter_query_parameters=['uuid']) + def test_encrypted(self): + ch = "history-native-sync-ch" + pubnub = PubNub(pnconf_enc_copy()) + pubnub.config.uuid = "history-native-sync-uuid" + + for i in range(COUNT): + result = pubnub.publish().channel(ch).message("hey-%s" % i).sync() + assert isinstance(result, PNPublishResult) + assert result.timetoken > 0 + + time.sleep(5) + + result = pubnub.history().channel(ch).count(COUNT).sync() + + assert isinstance(result, PNHistoryResult) + assert result.start_timetoken > 0 + assert result.end_timetoken > 0 + assert len(result.messages) == 5 + + assert result.messages[0].entry == 'hey-0' + assert result.messages[1].entry == 'hey-1' + assert result.messages[2].entry == 'hey-2' + assert result.messages[3].entry == 'hey-3' + assert result.messages[4].entry == 'hey-4' From fdc27f8a3068659cce070f62e2fc1dbdb5060dfc Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 26 Jul 2016 05:10:20 -0700 Subject: [PATCH 229/468] Add Time method --- pubnub/endpoints/time.py | 34 ++++++++++++++++++++++++ pubnub/models/consumer/time.py | 20 ++++++++++++++ pubnub/pubnub_core.py | 8 ++++-- pubnub/structures.py | 2 +- tests/integrational/asyncio/test_time.py | 17 ++++++++++++ tests/unit/test_time.py | 18 +++++++++++++ 6 files changed, 96 insertions(+), 3 deletions(-) create mode 100644 pubnub/endpoints/time.py create mode 100644 pubnub/models/consumer/time.py create mode 100644 tests/integrational/asyncio/test_time.py create mode 100644 tests/unit/test_time.py diff --git a/pubnub/endpoints/time.py b/pubnub/endpoints/time.py new file mode 100644 index 00000000..fb7ba97f --- /dev/null +++ b/pubnub/endpoints/time.py @@ -0,0 +1,34 @@ +from pubnub.endpoints.endpoint import Endpoint +from pubnub.enums import HttpMethod, PNOperationType +from pubnub.models.consumer.time import PNTimeResponse + + +class Time(Endpoint): + TIME_PATH = "/time/0" + + def build_params(self): + return {} + + def build_path(self): + return Time.TIME_PATH + + def http_method(self): + return HttpMethod.GET + + def validate_params(self): + pass + + def create_response(self, envelope): + return PNTimeResponse(envelope) + + def request_timeout(self): + return self.pubnub.config.non_subscribe_request_timeout + + def connect_timeout(self): + return self.pubnub.config.connect_timeout + + def operation_type(self): + return PNOperationType.PNTimeOperation + + def name(self): + return "Time" diff --git a/pubnub/models/consumer/time.py b/pubnub/models/consumer/time.py new file mode 100644 index 00000000..b9a117e4 --- /dev/null +++ b/pubnub/models/consumer/time.py @@ -0,0 +1,20 @@ +from datetime import date + + +class PNTimeResponse(object): + MULTIPLIER = 10000000 + + def __init__(self, server_response): + assert isinstance(server_response, list) + self.server_response = server_response + self.value_as_string = str(server_response[0]) + self.value_as_int = server_response[0] + + def __int__(self): + return self.value_as_int + + def __str__(self): + return self.value_as_string + + def date_time(self): + return date.fromtimestamp(self.value_as_int / PNTimeResponse.MULTIPLIER) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 968b189c..bede6955 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -4,6 +4,7 @@ from abc import ABCMeta, abstractmethod from pubnub.endpoints.history import History +from pubnub.endpoints.time import Time from .endpoints.access.audit import Audit from .endpoints.access.grant import Grant from .builders import SubscribeBuilder @@ -120,6 +121,9 @@ def remove_device_from_push(self): def history(self): return History(self) - def timestamp(self): - """ Make static """ + def time(self): + return Time(self) + + @staticmethod + def timestamp(): return int(time.time()) diff --git a/pubnub/structures.py b/pubnub/structures.py index 5f04b875..0f31d508 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -7,7 +7,7 @@ class RequestOptions(object): def __init__(self, path, params, method, request_timeout, connect_timeout, data=None, sort_arguments=False): assert len(path) > 0 - assert len(params) > 0 + assert isinstance(params, dict) assert isinstance(method, six.integer_types) assert isinstance(request_timeout, six.integer_types) assert isinstance(connect_timeout, six.integer_types) diff --git a/tests/integrational/asyncio/test_time.py b/tests/integrational/asyncio/test_time.py new file mode 100644 index 00000000..db9b96e7 --- /dev/null +++ b/tests/integrational/asyncio/test_time.py @@ -0,0 +1,17 @@ +import pytest +from datetime import date + +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests.helper import pnconf + + +@pytest.mark.asyncio +def test_single_channel(event_loop): + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + + env = yield from pubnub.time().future() + + assert int(env.result) > 0 + assert isinstance(env.result.date_time(), date) + + pubnub.stop() diff --git a/tests/unit/test_time.py b/tests/unit/test_time.py new file mode 100644 index 00000000..32a0f99f --- /dev/null +++ b/tests/unit/test_time.py @@ -0,0 +1,18 @@ +import unittest + +from datetime import date + +from pubnub.models.consumer.time import PNTimeResponse + + +class TestTime(unittest.TestCase): + def test_parse(self): + time = PNTimeResponse("[14695274331639244]") + + assert int(time) == 14695274331639244 + assert time.value_as_int == 14695274331639244 + + assert str(time) == "14695274331639244" + assert time.value_as_string == "14695274331639244" + + assert isinstance(time.date_time(), date) From f8752a55897f8349cdb3b4815ddbeb87520258ba Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 26 Jul 2016 08:55:04 -0700 Subject: [PATCH 230/468] Fix tests --- pubnub/crypto.py | 13 ++++++++----- pubnub/pubnub_core.py | 9 +++++---- tests/unit/test_time.py | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pubnub/crypto.py b/pubnub/crypto.py index b993e331..ec6dfb47 100644 --- a/pubnub/crypto.py +++ b/pubnub/crypto.py @@ -1,9 +1,12 @@ import hashlib import json -from json import JSONDecodeError from Crypto.Cipher import AES -from base64 import decodebytes, encodebytes + +try: + from base64 import decodebytes, encodebytes +except ImportError: + from base64 import decodestring, encodestring import sys @@ -48,7 +51,7 @@ def encrypt(key, msg): if v == 3: return encodebytes(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") else: - return encodebytes(cipher.encrypt(pad(msg))).replace("\n", "") + return encodestring(cipher.encrypt(pad(msg))).replace("\n", "") def decrypt(key, msg): @@ -58,9 +61,9 @@ def decrypt(key, msg): if v == 3: plain = depad((cipher.decrypt(decodebytes(msg.encode('utf-8')))).decode('utf-8')) else: - plain = depad(cipher.decrypt(decodebytes(msg))) + plain = depad(cipher.decrypt(decodestring(msg))) try: return json.loads(plain) - except (JSONDecodeError, SyntaxError): + except Exception: return plain diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index bede6955..6be5bb4a 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -3,12 +3,13 @@ from abc import ABCMeta, abstractmethod -from pubnub.endpoints.history import History -from pubnub.endpoints.time import Time -from .endpoints.access.audit import Audit -from .endpoints.access.grant import Grant + from .builders import SubscribeBuilder from .builders import UnsubscribeBuilder +from .endpoints.time import Time +from .endpoints.history import History +from .endpoints.access.audit import Audit +from .endpoints.access.grant import Grant from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup diff --git a/tests/unit/test_time.py b/tests/unit/test_time.py index 32a0f99f..0b6fb5f1 100644 --- a/tests/unit/test_time.py +++ b/tests/unit/test_time.py @@ -7,7 +7,7 @@ class TestTime(unittest.TestCase): def test_parse(self): - time = PNTimeResponse("[14695274331639244]") + time = PNTimeResponse([14695274331639244]) assert int(time) == 14695274331639244 assert time.value_as_int == 14695274331639244 From f1597352d89609649de055be2d69ec4d00da6c8d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 26 Jul 2016 09:18:13 -0700 Subject: [PATCH 231/468] Specify Python 3.4.4 version for .travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f6b55681..d8802a5b 100755 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ python: - "2.6" - "2.7" - "3.3" - - "3.4" + - "3.4.4" - "3.5" - "pypy" sudo: false From 2bd387a011616a5a19be13d3fad5b5b0630b3034 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 26 Jul 2016 09:27:36 -0700 Subject: [PATCH 232/468] Try another python version for tavis config --- scripts/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index accfd386..afc7baac 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -4,6 +4,6 @@ pip install -r requirements-dev.txt if [[ $TRAVIS_PYTHON_VERSION == 2.6 ]]; then pip install -r requirements26-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -r requirements27-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install -r requirements33-dev.txt; fi -if [[ $TRAVIS_PYTHON_VERSION == 3.4 ]]; then pip install -r requirements34-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == 3.4.4 ]]; then pip install -r requirements34-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi -if [[ $TRAVIS_PYTHON_VERSION == "pypy" ]]; then pip install -r requirements-pypy-dev.txt; fi \ No newline at end of file +if [[ $TRAVIS_PYTHON_VERSION == "pypy" ]]; then pip install -r requirements-pypy-dev.txt; fi From 08f8f108c5090605301f7873a2f602efcc0a1196 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 27 Jul 2016 04:08:17 -0700 Subject: [PATCH 233/468] Move request handler dependend methods to separate file --- pubnub/pubnub.py | 267 ++------------------- pubnub/request_handlers/__init__.py | 0 pubnub/request_handlers/native_requests.py | 255 ++++++++++++++++++++ pubnub/structures.py | 7 +- 4 files changed, 281 insertions(+), 248 deletions(-) create mode 100644 pubnub/request_handlers/__init__.py create mode 100644 pubnub/request_handlers/native_requests.py diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index b954f921..13419f42 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -1,37 +1,32 @@ import copy import logging import threading -import requests -# noinspection PyUnresolvedReferences -from six.moves.queue import Queue, Empty from threading import Event - +from six.moves.queue import Queue, Empty +from pubnub.request_handlers.native_requests import PubNubRequestHandler, RequestsHandler +from . import utils +from .callbacks import SubscribeCallback from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe -from .workers import SubscribeMessageWorker -from .pnconfiguration import PNConfiguration -from .managers import SubscriptionManager, PublishSequenceManager -from . import utils -from .structures import RequestOptions, ResponseInfo from .enums import PNStatusCategory, PNHeartbeatNotificationOptions -from .callbacks import SubscribeCallback -from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, \ - PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR -from .exceptions import PubNubException +from .managers import SubscriptionManager, PublishSequenceManager +from .pnconfiguration import PNConfiguration from .pubnub_core import PubNubCore +from .structures import PlatformOptions +from .workers import SubscribeMessageWorker logger = logging.getLogger("pubnub") class PubNub(PubNubCore): """PubNub Python API""" - ENTITY_THREAD_COUNTER = 0 def __init__(self, config): assert isinstance(config, PNConfiguration) - self.session = requests.Session() + + self._request_handler = RequestsHandler() PubNubCore.__init__(self, config) if self.config.enable_subscribe: @@ -42,120 +37,20 @@ def __init__(self, config): def sdk_platform(self): return "" - def request_sync(self, options): - res = self.pn_request(self.session, - self.config.scheme_and_host(), - self.headers, - options) - - # http error - if res.status_code != requests.codes.ok: - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - - raise PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - ) - - return res - - def request_async(self, endpoint_name, options, callback, cancellation_event): - # TODO: Rename to AsyncRequest - call = Call() - - def success_callback(res): - status_category = PNStatusCategory.PNUnknownCategory - response_info = None - - if res is not None: - url = utils.urlparse(res.url) - query = utils.parse_qs(url.query) - uuid = None - auth_key = None - - if 'uuid' in query and len(query['uuid']) > 0: - uuid = query['uuid'][0] - - if 'auth_key' in query and len(query['auth_key']) > 0: - auth_key = query['auth_key'][0] - - response_info = ResponseInfo( - status_code=res.status_code, - tls_enabled='https' == url.scheme, - origin=url.hostname, - uuid=uuid, - auth_key=auth_key, - client_request=res.request - ) - - if res.status_code != requests.codes.ok: - if res.status_code == 403: - status_category = PNStatusCategory.PNAccessDeniedCategory - - if res.status_code == 400: - status_category = PNStatusCategory.PNBadRequestCategory - - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - - callback(status_category, res.json(), response_info, PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - )) - call.executed_cb() - else: - callback(PNStatusCategory.PNAcknowledgmentCategory, res.json(), response_info, None) - call.executed_cb() - - def error_callback(e): - status_category = PNStatusCategory.PNBadRequestCategory - # TODO: allow non PN errors - - if not type(e) is PubNubException: - raise e - - if e._pn_error is PNERR_CONNECTION_ERROR: - status_category = PNStatusCategory.PNUnexpectedDisconnectCategory - elif e._pn_error is PNERR_CLIENT_TIMEOUT: - status_category = PNStatusCategory.PNTimeoutCategory + def set_request_handler(self, handler): + assert isinstance(handler, PubNubRequestHandler) + self._request_handler = handler - callback(status_category, None, None, e) - call.executed_cb() + def request_sync(self, endpoint_call_options): + platform_options = PlatformOptions(self.headers, self.config.scheme_and_host()) - client = AsyncHTTPClient(self, - success_callback, - error_callback, - options, - cancellation_event) + return self._request_handler.sync_request(platform_options, endpoint_call_options) - thread = threading.Thread( - target=client.run, - name="EndpointThread-%s-%d" % (endpoint_name, ++PubNub.ENTITY_THREAD_COUNTER) - ) - thread.setDaemon(True) - thread.start() + def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event): + platform_options = PlatformOptions(self.headers, self.config.scheme_and_host()) - call.thread = thread - call.cancellation_event = cancellation_event - - return call + return self._request_handler.async_request(endpoint_name, platform_options, endpoint_call_options, + callback, cancellation_event) def stop(self): self._subscription_manager.stop() @@ -170,128 +65,6 @@ def add_listener(self, listener): assert isinstance(listener, SubscribeCallback) self._subscription_manager.add_listener(listener) - def pn_request(self, session, scheme_and_host, headers, options): - assert isinstance(options, RequestOptions) - url = scheme_and_host + options.path - - args = { - "method": options.method_string, - 'headers': headers, - "url": url, - 'params': options.query_string, - 'timeout': (options.connect_timeout, options.request_timeout) - } - - if options.is_post(): - args['data'] = options.data - logger.debug("%s %s %s" % ( - options.method_string, - utils.build_url( - self.config.scheme(), - self.config.origin, - options.path, - options.query_string), options.data)) - else: - logger.debug("%s %s" % ( - options.method_string, - utils.build_url( - self.config.scheme(), - self.config.origin, - options.path, - options.query_string))) - - # connection error - try: - res = session.request(**args) - logger.debug("GOT %s" % res.text) - except requests.exceptions.ConnectionError as e: - raise PubNubException( - pn_error=PNERR_CONNECTION_ERROR, - errormsg=str(e) - ) - except requests.exceptions.HTTPError as e: - raise PubNubException( - pn_error=PNERR_HTTP_ERROR, - errormsg=str(e) - ) - except requests.exceptions.Timeout as e: - raise PubNubException( - pn_error=PNERR_CLIENT_TIMEOUT, - errormsg=str(e) - ) - except requests.exceptions.TooManyRedirects as e: - raise PubNubException( - pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, - errormsg=str(e) - ) - except Exception as e: - raise PubNubException( - pn_error=PNERR_UNKNOWN_ERROR, - errormsg=str(e) - ) - - return res - - -class AsyncHTTPClient: - """A wrapper for threaded calls""" - - def __init__(self, pubnub, success, error, options, cancellation_event): - self.options = options - self.success = success - self.error = error - self.pubnub = pubnub - self.cancellation_event = cancellation_event - - def run(self): - try: - res = self.pubnub.pn_request( - self.pubnub.session, self.pubnub.config.scheme_and_host(), - self.pubnub.headers, self.options) - - if self.cancellation_event is not None and self.cancellation_event.isSet(): - # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call - return - - self.success(res) - except PubNubException as e: - self.error(e) - except Exception as e: - # TODO: log the exception - self.error(PubNubException( - pn_error=PNERR_UNKNOWN_ERROR, - errormsg="Exception in request thread: %s" % str(e) - )) - - -class Call(object): - """ - A platform dependent representation of async PubNub method call - """ - - def __init__(self): - self.thread = None - self.cancellation_event = None - self.is_executed = False - self.is_canceled = False - - def cancel(self): - """ - Set Event flag to stop thread on timeout. This will not stop thread immediately, it will stopped - only after ongoing request will be finished - :return: nothing - """ - if self.cancellation_event is not None: - self.cancellation_event.set() - self.is_canceled = True - - def join(self): - if isinstance(self.thread, threading.Thread): - self.thread.join() - - def executed_cb(self): - self.is_executed = True - class NativeSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): diff --git a/pubnub/request_handlers/__init__.py b/pubnub/request_handlers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pubnub/request_handlers/native_requests.py b/pubnub/request_handlers/native_requests.py new file mode 100644 index 00000000..6fe7c310 --- /dev/null +++ b/pubnub/request_handlers/native_requests.py @@ -0,0 +1,255 @@ +import logging +import threading +import requests + +from abc import abstractmethod, ABCMeta +from pubnub import utils +from pubnub.enums import PNStatusCategory +from pubnub.errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, \ + PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR +from pubnub.errors import PNERR_SERVER_ERROR +from pubnub.exceptions import PubNubException +from pubnub.structures import RequestOptions, PlatformOptions, ResponseInfo + +logger = logging.getLogger("pubnub") + + +class PubNubRequestHandler(object): + __metaclass__ = ABCMeta + + @abstractmethod + def sync_request(self, platform_options, endpoint_call_options): + pass + + +class RequestsHandler(PubNubRequestHandler): + """ PubNub Python SDK Native requests handler based on `requests` HTTP library. """ + ENDPOINT_THREAD_COUNTER = 0 + + def __init__(self): + self.session = requests.Session() + + def sync_request(self, platform_options, endpoint_call_options): + res = self.request(platform_options, endpoint_call_options) + + # http error + if res.status_code != requests.codes.ok: + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + raise PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ) + + return res + + def async_request(self, endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event): + call = Call() + + def success_callback(res): + status_category = PNStatusCategory.PNUnknownCategory + response_info = None + + if res is not None: + url = utils.urlparse(res.url) + query = utils.parse_qs(url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=res.status_code, + tls_enabled='https' == url.scheme, + origin=url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=res.request + ) + + if res.status_code != requests.codes.ok: + if res.status_code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if res.status_code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + callback(status_category, res.json(), response_info, PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + )) + call.executed_cb() + else: + callback(PNStatusCategory.PNAcknowledgmentCategory, res.json(), response_info, None) + call.executed_cb() + + def error_callback(e): + status_category = PNStatusCategory.PNBadRequestCategory + # TODO: allow non PN errors + + if not type(e) is PubNubException: + raise e + + if e._pn_error is PNERR_CONNECTION_ERROR: + status_category = PNStatusCategory.PNUnexpectedDisconnectCategory + elif e._pn_error is PNERR_CLIENT_TIMEOUT: + status_category = PNStatusCategory.PNTimeoutCategory + + callback(status_category, None, None, e) + call.executed_cb() + + def callback_to_invoke_in_another_thread(): + try: + res = self.request(platform_options, endpoint_call_options) + if cancellation_event is not None and cancellation_event.isSet(): + # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call + return + + success_callback(res) + except PubNubException as e: + error_callback(e) + except Exception as e: + # TODO: log the exception + # TODO: Should non-pubnub exception to be reraised? + error_callback(PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg="Exception in request thread: %s" % str(e) + )) + + client = AsyncHTTPClient(callback_to_invoke_in_another_thread) + + thread = threading.Thread( + target=client.run, + name="EndpointThread-%s-%d" % (endpoint_name, ++RequestsHandler.ENDPOINT_THREAD_COUNTER) + ) + thread.setDaemon(True) + thread.start() + + call.thread = thread + call.cancellation_event = cancellation_event + + return call + + def request(self, p_options, e_options): + assert isinstance(p_options, PlatformOptions) + assert isinstance(e_options, RequestOptions) + url = p_options.scheme_and_host + e_options.path + + args = { + "method": e_options.method_string, + 'headers': p_options.headers, + "url": url, + 'params': e_options.query_string, + 'timeout': (e_options.connect_timeout, e_options.request_timeout) + } + + if e_options.is_post(): + args['data'] = e_options.data + logger.debug("%s %s %s" % ( + e_options.method_string, + utils.build_url( + p_options.scheme_and_host, + e_options.path, + e_options.query_string), e_options.data)) + else: + logger.debug("%s %s" % ( + e_options.method_string, + utils.build_url( + p_options.scheme_and_host, + e_options.path, + e_options.query_string))) + + # connection error + try: + res = self.session.request(**args) + logger.debug("GOT %s" % res.text) + except requests.exceptions.ConnectionError as e: + raise PubNubException( + pn_error=PNERR_CONNECTION_ERROR, + errormsg=str(e) + ) + except requests.exceptions.HTTPError as e: + raise PubNubException( + pn_error=PNERR_HTTP_ERROR, + errormsg=str(e) + ) + except requests.exceptions.Timeout as e: + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + except requests.exceptions.TooManyRedirects as e: + raise PubNubException( + pn_error=PNERR_TOO_MANY_REDIRECTS_ERROR, + errormsg=str(e) + ) + except Exception as e: + raise PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg=str(e) + ) + + return res + + +class AsyncHTTPClient: + """A wrapper for threaded calls""" + + def __init__(self, callback_to_invoke): + self._callback_to_invoke = callback_to_invoke + + def run(self): + self._callback_to_invoke() + + +class Call(object): + """ + A platform dependent representation of async PubNub method call + """ + + def __init__(self): + self.thread = None + self.cancellation_event = None + self.is_executed = False + self.is_canceled = False + + def cancel(self): + """ + Set Event flag to stop thread on timeout. This will not stop thread immediately, it will stopped + only after ongoing request will be finished + :return: nothing + """ + if self.cancellation_event is not None: + self.cancellation_event.set() + self.is_canceled = True + + def join(self): + if isinstance(self.thread, threading.Thread): + self.thread.join() + + def executed_cb(self): + self.is_executed = True diff --git a/pubnub/structures.py b/pubnub/structures.py index 0f31d508..a7986e5e 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -31,7 +31,6 @@ def is_post(self): def query_list(self): """ All query keys and values should be already encoded inside a build_params() method""" - # TODO: add option to sort params alphabetically(for PAM requests) s = [] for k, v in self.params.items(): @@ -47,6 +46,12 @@ def query_string(self): return str('&'.join(self.query_list())) +class PlatformOptions(object): + def __init__(self, headers, scheme_and_host): + self.headers = headers + self.scheme_and_host = scheme_and_host + + class ResponseInfo(object): def __init__(self, status_code, tls_enabled, origin, uuid, auth_key, client_request): self.status_code = status_code From 706d3450b14249e47e14a44265eab8a81e33de52 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 28 Jul 2016 08:20:09 -0700 Subject: [PATCH 234/468] Native requests request handler refactoring --- pubnub/pubnub.py | 8 ++++--- pubnub/request_handlers/base.py | 9 ++++++++ ...native_requests.py => requests_handler.py} | 23 +++++++------------ 3 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 pubnub/request_handlers/base.py rename pubnub/request_handlers/{native_requests.py => requests_handler.py} (93%) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 13419f42..3ff94dac 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -4,8 +4,10 @@ from threading import Event from six.moves.queue import Queue, Empty -from pubnub.request_handlers.native_requests import PubNubRequestHandler, RequestsHandler + from . import utils +from .request_handlers.base import BaseRequestHandler +from .request_handlers.requests_handler import RequestsRequestHandler from .callbacks import SubscribeCallback from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave @@ -26,7 +28,7 @@ class PubNub(PubNubCore): def __init__(self, config): assert isinstance(config, PNConfiguration) - self._request_handler = RequestsHandler() + self._request_handler = RequestsRequestHandler() PubNubCore.__init__(self, config) if self.config.enable_subscribe: @@ -38,7 +40,7 @@ def sdk_platform(self): return "" def set_request_handler(self, handler): - assert isinstance(handler, PubNubRequestHandler) + assert isinstance(handler, BaseRequestHandler) self._request_handler = handler def request_sync(self, endpoint_call_options): diff --git a/pubnub/request_handlers/base.py b/pubnub/request_handlers/base.py new file mode 100644 index 00000000..fb90342e --- /dev/null +++ b/pubnub/request_handlers/base.py @@ -0,0 +1,9 @@ +from abc import abstractmethod, ABCMeta + + +class BaseRequestHandler(object): + __metaclass__ = ABCMeta + + @abstractmethod + def sync_request(self, platform_options, endpoint_call_options): + pass diff --git a/pubnub/request_handlers/native_requests.py b/pubnub/request_handlers/requests_handler.py similarity index 93% rename from pubnub/request_handlers/native_requests.py rename to pubnub/request_handlers/requests_handler.py index 6fe7c310..eb007df7 100644 --- a/pubnub/request_handlers/native_requests.py +++ b/pubnub/request_handlers/requests_handler.py @@ -2,35 +2,28 @@ import threading import requests -from abc import abstractmethod, ABCMeta +from requests import Session from pubnub import utils from pubnub.enums import PNStatusCategory from pubnub.errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, \ PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR from pubnub.errors import PNERR_SERVER_ERROR from pubnub.exceptions import PubNubException +from pubnub.request_handlers.base import BaseRequestHandler from pubnub.structures import RequestOptions, PlatformOptions, ResponseInfo logger = logging.getLogger("pubnub") -class PubNubRequestHandler(object): - __metaclass__ = ABCMeta - - @abstractmethod - def sync_request(self, platform_options, endpoint_call_options): - pass - - -class RequestsHandler(PubNubRequestHandler): +class RequestsRequestHandler(BaseRequestHandler): """ PubNub Python SDK Native requests handler based on `requests` HTTP library. """ ENDPOINT_THREAD_COUNTER = 0 def __init__(self): - self.session = requests.Session() + self.session = Session() def sync_request(self, platform_options, endpoint_call_options): - res = self.request(platform_options, endpoint_call_options) + res = self._invoke_request(platform_options, endpoint_call_options) # http error if res.status_code != requests.codes.ok: @@ -124,7 +117,7 @@ def error_callback(e): def callback_to_invoke_in_another_thread(): try: - res = self.request(platform_options, endpoint_call_options) + res = self._invoke_request(platform_options, endpoint_call_options) if cancellation_event is not None and cancellation_event.isSet(): # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call return @@ -144,7 +137,7 @@ def callback_to_invoke_in_another_thread(): thread = threading.Thread( target=client.run, - name="EndpointThread-%s-%d" % (endpoint_name, ++RequestsHandler.ENDPOINT_THREAD_COUNTER) + name="EndpointThread-%s-%d" % (endpoint_name, ++RequestsRequestHandler.ENDPOINT_THREAD_COUNTER) ) thread.setDaemon(True) thread.start() @@ -154,7 +147,7 @@ def callback_to_invoke_in_another_thread(): return call - def request(self, p_options, e_options): + def _invoke_request(self, p_options, e_options): assert isinstance(p_options, PlatformOptions) assert isinstance(e_options, RequestOptions) url = p_options.scheme_and_host + e_options.path From 92f337447316282fba654676a8e7d303084f5e9c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 29 Jul 2016 03:08:06 -0700 Subject: [PATCH 235/468] Refactoring of RequestsRequestHandler --- pubnub/endpoints/endpoint.py | 34 +-- pubnub/enums.py | 1 + pubnub/request_handlers/requests_handler.py | 202 +++++++++--------- pubnub/structures.py | 13 +- .../native_threads/test_publish.py | 10 +- 5 files changed, 130 insertions(+), 130 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index fdf104bb..adc65199 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -74,13 +74,14 @@ def affected_channels_groups(self): def options(self): return RequestOptions(self.build_path(), self.build_params(), self.http_method(), self.request_timeout(), - self.connect_timeout(), self.build_data(), self._sort_params) + self.connect_timeout(), self.create_response, self.create_status_response, + self.build_data(), self._sort_params) def sync(self): self.validate_params() - raw_response = self.pubnub.request_sync(self.options()) - return self.create_response(raw_response.json()) + envelope = self.pubnub.request_sync(self.options()) + return self.create_response(envelope.result) def async(self, callback): try: @@ -90,11 +91,8 @@ def async(self, callback): callback(None, self.create_status_response(PNStatusCategory.PNBadRequestCategory, None, None, e)) return - def callback_wrapper(status_category, response, response_info, exception): - callback( - self.create_response(response), - self.create_status_response(status_category, response, response_info, exception) - ) + def callback_wrapper(envelope): + callback(envelope.result, envelope.status) return self.pubnub.request_async(self.name(), options, callback_wrapper, self._cancellation_event) @@ -147,16 +145,7 @@ def validate_publish_key(self): raise PubNubException(pn_error=PNERR_PUBLISH_KEY_MISSING) def create_status_response(self, category, response, response_info, exception): - """ - Used only by async requests - - :param category: of response - :param response_info: unified response info - :param response: already decoded json data - :param exception: if any - :return: - """ - + # TODO: rename to create_status if response_info is not None: assert isinstance(response_info, ResponseInfo) @@ -186,12 +175,3 @@ def create_status_response(self, category, response, response_info, exception): return pn_status - # TODO: move to utils? - # @classmethod - # def join_query(cls, params): - # query_list = [] - # - # for k, v in params.items(): - # query_list.append(k + "=" + v) - # - # return "&".join(query_list) diff --git a/pubnub/enums.py b/pubnub/enums.py index 486de1a2..931ed018 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -27,6 +27,7 @@ class PNStatusCategory(object): PNDecryptionErrorCategory = 14 PNTLSConnectionFailedCategory = 15 PNTLSUntrustedCertificateCategory = 16 + PNInternalExceptionCategory = 17 class PNOperationType(object): diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index eb007df7..5fd178c1 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -10,7 +10,7 @@ from pubnub.errors import PNERR_SERVER_ERROR from pubnub.exceptions import PubNubException from pubnub.request_handlers.base import BaseRequestHandler -from pubnub.structures import RequestOptions, PlatformOptions, ResponseInfo +from pubnub.structures import RequestOptions, PlatformOptions, ResponseInfo, Envelope logger = logging.getLogger("pubnub") @@ -23,115 +23,39 @@ def __init__(self): self.session = Session() def sync_request(self, platform_options, endpoint_call_options): - res = self._invoke_request(platform_options, endpoint_call_options) - - # http error - if res.status_code != requests.codes.ok: - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - - raise PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - ) - - return res + return self._build_envelope(platform_options, endpoint_call_options) def async_request(self, endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event): call = Call() - def success_callback(res): - status_category = PNStatusCategory.PNUnknownCategory - response_info = None - - if res is not None: - url = utils.urlparse(res.url) - query = utils.parse_qs(url.query) - uuid = None - auth_key = None - - if 'uuid' in query and len(query['uuid']) > 0: - uuid = query['uuid'][0] - - if 'auth_key' in query and len(query['auth_key']) > 0: - auth_key = query['auth_key'][0] - - response_info = ResponseInfo( - status_code=res.status_code, - tls_enabled='https' == url.scheme, - origin=url.hostname, - uuid=uuid, - auth_key=auth_key, - client_request=res.request - ) - - if res.status_code != requests.codes.ok: - if res.status_code == 403: - status_category = PNStatusCategory.PNAccessDeniedCategory - - if res.status_code == 400: - status_category = PNStatusCategory.PNBadRequestCategory - - if res.text is None: - text = "N/A" - else: - text = res.text - - if res.status_code >= 500: - err = PNERR_SERVER_ERROR - else: - err = PNERR_CLIENT_ERROR - - callback(status_category, res.json(), response_info, PubNubException( - pn_error=err, - errormsg=text, - status_code=res.status_code - )) - call.executed_cb() - else: - callback(PNStatusCategory.PNAcknowledgmentCategory, res.json(), response_info, None) - call.executed_cb() - - def error_callback(e): - status_category = PNStatusCategory.PNBadRequestCategory - # TODO: allow non PN errors - - if not type(e) is PubNubException: - raise e - - if e._pn_error is PNERR_CONNECTION_ERROR: - status_category = PNStatusCategory.PNUnexpectedDisconnectCategory - elif e._pn_error is PNERR_CLIENT_TIMEOUT: - status_category = PNStatusCategory.PNTimeoutCategory - - callback(status_category, None, None, e) - call.executed_cb() - def callback_to_invoke_in_another_thread(): try: - res = self._invoke_request(platform_options, endpoint_call_options) + envelope = self._build_envelope(platform_options, endpoint_call_options) if cancellation_event is not None and cancellation_event.isSet(): - # Since there are no way to affect on ongoing request it's response will be just ignored on cancel call + # Since there are no way to affect on ongoing request it's response will + # be just ignored on cancel call return - success_callback(res) + callback(envelope) except PubNubException as e: - error_callback(e) + callback(Envelope( + result=None, + status=endpoint_call_options.create_status( + category=PNStatusCategory.PNBadRequestCategory, + response=None, + response_info=None, + exception=e))) except Exception as e: # TODO: log the exception - # TODO: Should non-pubnub exception to be reraised? - error_callback(PubNubException( - pn_error=PNERR_UNKNOWN_ERROR, - errormsg="Exception in request thread: %s" % str(e) - )) + callback(Envelope( + result=None, + status=endpoint_call_options.create_status( + category=PNStatusCategory.PNInternalExceptionCategory, + response=None, + response_info=None, + exception=e))) + finally: + call.executed_cb() client = AsyncHTTPClient(callback_to_invoke_in_another_thread) @@ -147,9 +71,90 @@ def callback_to_invoke_in_another_thread(): return call + def _build_envelope(self, p_options, e_options): + """ A wrapper for _invoke_url to separate request logic """ + + status_category = PNStatusCategory.PNUnknownCategory + response_info = None + + try: + res = self._invoke_request(p_options, e_options) + except PubNubException as e: + if e._pn_error is PNERR_CONNECTION_ERROR: + status_category = PNStatusCategory.PNUnexpectedDisconnectCategory + elif e._pn_error is PNERR_CLIENT_TIMEOUT: + status_category = PNStatusCategory.PNTimeoutCategory + + return Envelope( + result=None, + status=e_options.create_status( + category=status_category, + response=None, + response_info=response_info, + exception=e)) + + if res is not None: + url = utils.urlparse(res.url) + query = utils.parse_qs(url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=res.status_code, + tls_enabled='https' == url.scheme, + origin=url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=res.request + ) + + if res.status_code != requests.codes.ok: + if res.status_code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if res.status_code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if res.text is None: + text = "N/A" + else: + text = res.text + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + return Envelope( + result=e_options.create_response(res.json()), + status=e_options.create_status( + category=status_category, + response=res.json(), + response_info=response_info, + exception=PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ))) + else: + return Envelope( + result=e_options.create_response(res.json()), + status=e_options.create_status( + category=PNStatusCategory.PNAcknowledgmentCategory, + response=res.json(), + response_info=response_info, + exception=None)) + def _invoke_request(self, p_options, e_options): assert isinstance(p_options, PlatformOptions) assert isinstance(e_options, RequestOptions) + url = p_options.scheme_and_host + e_options.path args = { @@ -176,7 +181,6 @@ def _invoke_request(self, p_options, e_options): e_options.path, e_options.query_string))) - # connection error try: res = self.session.request(**args) logger.debug("GOT %s" % res.text) diff --git a/pubnub/structures.py b/pubnub/structures.py index a7986e5e..c25cd73f 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -4,8 +4,8 @@ class RequestOptions(object): - def __init__(self, path, params, method, request_timeout, connect_timeout, data=None, - sort_arguments=False): + def __init__(self, path, params, method, request_timeout, connect_timeout, create_response, + create_status, data=None, sort_arguments=False): assert len(path) > 0 assert isinstance(params, dict) assert isinstance(method, six.integer_types) @@ -22,6 +22,9 @@ def __init__(self, path, params, method, request_timeout, connect_timeout, data= self.data = data self.sort_params = sort_arguments + self.create_response = create_response + self.create_status = create_status + @property def method_string(self): return HttpMethod.string(self._method) @@ -60,3 +63,9 @@ def __init__(self, status_code, tls_enabled, origin, uuid, auth_key, client_requ self.uuid = uuid self.auth_key = auth_key self.client_request = client_request + + +class Envelope(object): + def __init__(self, result, status): + self.result = result + self.status = status diff --git a/tests/integrational/native_threads/test_publish.py b/tests/integrational/native_threads/test_publish.py index edc3a877..c8600c7a 100644 --- a/tests/integrational/native_threads/test_publish.py +++ b/tests/integrational/native_threads/test_publish.py @@ -2,11 +2,12 @@ import threading import unittest import pubnub +from pubnub.enums import PNStatusCategory from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub -from tests.helper import pnconf, pnconf_enc +from tests.helper import pnconf, pnconf_enc, pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -22,9 +23,13 @@ def callback(self, response, status): def assert_success(self): self.event.wait() - assert not self.status.is_error() + if self.status.is_error(): + self.fail(str(self.status.error_data.exception)) assert isinstance(self.response, PNPublishResult) assert self.response.timetoken > 1 + self.event.clear() + self.response = None + self.status = None def assert_success_publish_get(self, msg): PubNub(pnconf).publish() \ @@ -138,6 +143,7 @@ def test_invalid_key(self): self.event.wait() assert self.status.is_error() + assert self.status.category is PNStatusCategory.PNBadRequestCategory assert self.status.original_response[0] is 0 assert self.status.original_response[1] == 'Invalid Key' assert "HTTP Client Error (400):" in str(self.status.error_data.exception) From 71eb8a3ba66bb58f06f6550a3e3059dad19c9890 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 29 Jul 2016 03:55:10 -0700 Subject: [PATCH 236/468] Fix native sync tests after refactoring --- pubnub/endpoints/endpoint.py | 6 +- .../native_sync/test_channel_groups.py | 68 ++++++------- .../integrational/native_sync/test_history.py | 52 +++++----- .../integrational/native_sync/test_publish.py | 96 +++++++++---------- tests/integrational/native_sync/test_state.py | 36 +++---- 5 files changed, 131 insertions(+), 127 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index adc65199..bfbcb4bf 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -81,7 +81,11 @@ def sync(self): self.validate_params() envelope = self.pubnub.request_sync(self.options()) - return self.create_response(envelope.result) + + if envelope.status.is_error(): + raise envelope.status.error_data.exception + + return envelope def async(self, callback): try: diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 77953cab..47c74f52 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -20,41 +20,41 @@ def test_single_channel(self): pubnub = PubNub(pnconf_copy()) # add - result = pubnub.add_channel_to_channel_group() \ + envelope = pubnub.add_channel_to_channel_group() \ .channels(ch) \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsAddChannelResult) + assert isinstance(envelope.result, PNChannelGroupsAddChannelResult) time.sleep(2) # list - result = pubnub.list_channels_in_channel_group() \ + envelope = pubnub.list_channels_in_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsListResult) - assert len(result.channels) == 1 - assert result.channels[0] == ch + assert isinstance(envelope.result, PNChannelGroupsListResult) + assert len(envelope.result.channels) == 1 + assert envelope.result.channels[0] == ch # remove - result = pubnub.remove_channel_from_channel_group() \ + envelope = pubnub.remove_channel_from_channel_group() \ .channels(ch) \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsRemoveChannelResult) + assert isinstance(envelope.result, PNChannelGroupsRemoveChannelResult) time.sleep(2) # list - result = pubnub.list_channels_in_channel_group() \ + envelope = pubnub.list_channels_in_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsListResult) - assert len(result.channels) == 0 + assert isinstance(envelope.result, PNChannelGroupsListResult) + assert len(envelope.result.channels) == 0 @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml', @@ -66,42 +66,42 @@ def test_add_remove_multiple_channels(self): pubnub = PubNub(pnconf_copy()) # add - result = pubnub.add_channel_to_channel_group() \ + envelope = pubnub.add_channel_to_channel_group() \ .channels([ch1, ch2]) \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsAddChannelResult) + assert isinstance(envelope.result, PNChannelGroupsAddChannelResult) time.sleep(1) # list - result = pubnub.list_channels_in_channel_group() \ + envelope = pubnub.list_channels_in_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsListResult) - assert len(result.channels) == 2 - assert ch1 in result.channels - assert ch2 in result.channels + assert isinstance(envelope.result, PNChannelGroupsListResult) + assert len(envelope.result.channels) == 2 + assert ch1 in envelope.result.channels + assert ch2 in envelope.result.channels # remove - result = pubnub.remove_channel_from_channel_group() \ + envelope = pubnub.remove_channel_from_channel_group() \ .channels([ch1, ch2]) \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsRemoveChannelResult) + assert isinstance(envelope.result, PNChannelGroupsRemoveChannelResult) time.sleep(1) # list - result = pubnub.list_channels_in_channel_group() \ + envelope = pubnub.list_channels_in_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsListResult) - assert len(result.channels) == 0 + assert isinstance(envelope.result, PNChannelGroupsListResult) + assert len(envelope.result.channels) == 0 @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml', @@ -112,37 +112,37 @@ def test_add_channel_remove_group(self): pubnub = PubNub(pnconf_copy()) # add - result = pubnub.add_channel_to_channel_group() \ + envelope = pubnub.add_channel_to_channel_group() \ .channels(ch) \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsAddChannelResult) + assert isinstance(envelope.result, PNChannelGroupsAddChannelResult) time.sleep(1) # list - result = pubnub.list_channels_in_channel_group() \ + envelope = pubnub.list_channels_in_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsListResult) - assert len(result.channels) == 1 - assert result.channels[0] == ch + assert isinstance(envelope.result, PNChannelGroupsListResult) + assert len(envelope.result.channels) == 1 + assert envelope.result.channels[0] == ch # remove - result = pubnub.remove_channel_group() \ + envelope = pubnub.remove_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsRemoveGroupResult) + assert isinstance(envelope.result, PNChannelGroupsRemoveGroupResult) time.sleep(1) # list - result = pubnub.list_channels_in_channel_group() \ + envelope = pubnub.list_channels_in_channel_group() \ .channel_group(gr) \ .sync() - assert isinstance(result, PNChannelGroupsListResult) - assert len(result.channels) == 0 + assert isinstance(envelope.result, PNChannelGroupsListResult) + assert len(envelope.result.channels) == 0 diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 8db2a4fc..2416254c 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -22,24 +22,24 @@ def test_basic(self): pubnub.config.uuid = "history-native-sync-uuid" for i in range(COUNT): - result = pubnub.publish().channel(ch).message("hey-%s" % i).sync() - assert isinstance(result, PNPublishResult) - assert result.timetoken > 0 + envelope = pubnub.publish().channel(ch).message("hey-%s" % i).sync() + assert isinstance(envelope.result, PNPublishResult) + assert envelope.result.timetoken > 0 time.sleep(5) - result = pubnub.history().channel(ch).count(COUNT).sync() + envelope = pubnub.history().channel(ch).count(COUNT).sync() - assert isinstance(result, PNHistoryResult) - assert result.start_timetoken > 0 - assert result.end_timetoken > 0 - assert len(result.messages) == 5 + assert isinstance(envelope.result, PNHistoryResult) + assert envelope.result.start_timetoken > 0 + assert envelope.result.end_timetoken > 0 + assert len(envelope.result.messages) == 5 - assert result.messages[0].entry == 'hey-0' - assert result.messages[1].entry == 'hey-1' - assert result.messages[2].entry == 'hey-2' - assert result.messages[3].entry == 'hey-3' - assert result.messages[4].entry == 'hey-4' + assert envelope.result.messages[0].entry == 'hey-0' + assert envelope.result.messages[1].entry == 'hey-1' + assert envelope.result.messages[2].entry == 'hey-2' + assert envelope.result.messages[3].entry == 'hey-3' + assert envelope.result.messages[4].entry == 'hey-4' @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/history/encoded.yaml', filter_query_parameters=['uuid']) @@ -49,21 +49,21 @@ def test_encrypted(self): pubnub.config.uuid = "history-native-sync-uuid" for i in range(COUNT): - result = pubnub.publish().channel(ch).message("hey-%s" % i).sync() - assert isinstance(result, PNPublishResult) - assert result.timetoken > 0 + envelope = pubnub.publish().channel(ch).message("hey-%s" % i).sync() + assert isinstance(envelope.result, PNPublishResult) + assert envelope.result.timetoken > 0 time.sleep(5) - result = pubnub.history().channel(ch).count(COUNT).sync() + envelope = pubnub.history().channel(ch).count(COUNT).sync() - assert isinstance(result, PNHistoryResult) - assert result.start_timetoken > 0 - assert result.end_timetoken > 0 - assert len(result.messages) == 5 + assert isinstance(envelope.result, PNHistoryResult) + assert envelope.result.start_timetoken > 0 + assert envelope.result.end_timetoken > 0 + assert len(envelope.result.messages) == 5 - assert result.messages[0].entry == 'hey-0' - assert result.messages[1].entry == 'hey-1' - assert result.messages[2].entry == 'hey-2' - assert result.messages[3].entry == 'hey-3' - assert result.messages[4].entry == 'hey-4' + assert envelope.result.messages[0].entry == 'hey-0' + assert envelope.result.messages[1].entry == 'hey-1' + assert envelope.result.messages[2].entry == 'hey-2' + assert envelope.result.messages[3].entry == 'hey-3' + assert envelope.result.messages[4].entry == 'hey-4' diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index 10bc69e1..0987d7e4 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -16,13 +16,13 @@ class TestPubNubPublish(unittest.TestCase): filter_query_parameters=['uuid']) def test_publish_string_get(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message("hi") \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -30,13 +30,13 @@ def test_publish_string_get(self): filter_query_parameters=['uuid']) def test_publish_list_get(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message(["hi", "hi2", "hi3"]) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -44,13 +44,13 @@ def test_publish_list_get(self): filter_query_parameters=['uuid'], match_on=['publish_object']) def test_publish_object_get(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message({"name": "Alex", "online": True}) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -58,13 +58,13 @@ def test_publish_object_get(self): filter_query_parameters=['uuid']) def test_publish_bool_get(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -72,13 +72,13 @@ def test_publish_bool_get(self): filter_query_parameters=['uuid']) def test_publish_int_get(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message(5) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -86,13 +86,13 @@ def test_publish_int_get(self): filter_query_parameters=['uuid']) def test_publish_encrypted_string_get(self): try: - res = PubNub(pnconf_enc).publish() \ + env = PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("encrypted string") \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -100,13 +100,13 @@ def test_publish_encrypted_string_get(self): filter_query_parameters=['uuid']) def test_publish_encrypted_list_get(self): try: - res = PubNub(pnconf_enc).publish() \ + env = PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message(["encrypted", "list"]) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -114,14 +114,14 @@ def test_publish_encrypted_list_get(self): filter_query_parameters=['uuid']) def test_publish_string_post(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message("hi") \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -129,14 +129,14 @@ def test_publish_string_post(self): filter_query_parameters=['uuid']) def test_publish_list_post(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message(["hi", "hi2", "hi3"]) \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -144,14 +144,14 @@ def test_publish_list_post(self): filter_query_parameters=['uuid']) def test_publish_object_post(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message({"name": "Alex", "online": True}) \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -159,14 +159,14 @@ def test_publish_object_post(self): filter_query_parameters=['uuid']) def test_publish_bool_post(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message(True) \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -174,14 +174,14 @@ def test_publish_bool_post(self): filter_query_parameters=['uuid']) def test_publish_int_post(self): try: - res = PubNub(pnconf).publish() \ + env = PubNub(pnconf).publish() \ .channel("ch1") \ .message(5) \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -189,14 +189,14 @@ def test_publish_int_post(self): filter_query_parameters=['uuid']) def test_publish_encrypted_string_post(self): try: - res = PubNub(pnconf_enc).publish() \ + env = PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("encrypted string POST") \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -204,14 +204,14 @@ def test_publish_encrypted_string_post(self): filter_query_parameters=['uuid']) def test_publish_encrypted_list_post(self): try: - res = PubNub(pnconf_enc).publish() \ + env = PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message(["encrypted", "list", "POST"]) \ .use_post(True) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -275,14 +275,14 @@ def test_publish_with_meta(self): meta = {'a': 2, 'b': 'qwer'} try: - res = PubNub(pnconf_enc).publish() \ + env = PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("hey") \ .meta(meta) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) @@ -290,13 +290,13 @@ def test_publish_with_meta(self): filter_query_parameters=['uuid']) def test_publish_do_not_store(self): try: - res = PubNub(pnconf_enc).publish() \ + env = PubNub(pnconf_enc).publish() \ .channel("ch1") \ .message("hey") \ .should_store(False) \ .sync() - assert isinstance(res, PNPublishResult) - assert res.timetoken > 1 + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py index 8b0432bd..fd328273 100644 --- a/tests/integrational/native_sync/test_state.py +++ b/tests/integrational/native_sync/test_state.py @@ -18,17 +18,17 @@ def test_single_channel(self): pubnub.config.uuid = "state-native-sync-uuid" state = {"name": "Alex", "count": 5} - result = pubnub.set_state().channels(ch).state(state).sync() + envelope = pubnub.set_state().channels(ch).state(state).sync() - assert isinstance(result, PNSetStateResult) - assert result.state['name'] == "Alex" - assert result.state['count'] == 5 + assert isinstance(envelope.result, PNSetStateResult) + assert envelope.result.state['name'] == "Alex" + assert envelope.result.state['count'] == 5 - result = pubnub.get_state().channels(ch).sync() + envelope = pubnub.get_state().channels(ch).sync() - assert isinstance(result, PNGetStateResult) - assert result.channels[ch]['name'] == "Alex" - assert result.channels[ch]['count'] == 5 + assert isinstance(envelope.result, PNGetStateResult) + assert envelope.result.channels[ch]['name'] == "Alex" + assert envelope.result.channels[ch]['count'] == 5 @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml', filter_query_parameters=['uuid'], match_on=['state_object_in_query']) @@ -39,16 +39,16 @@ def test_multiple_channels(self): pubnub.config.uuid = "state-native-sync-uuid" state = {"name": "Alex", "count": 5} - result = pubnub.set_state().channels([ch1, ch2]).state(state).sync() + envelope = pubnub.set_state().channels([ch1, ch2]).state(state).sync() - assert isinstance(result, PNSetStateResult) - assert result.state['name'] == "Alex" - assert result.state['count'] == 5 + assert isinstance(envelope.result, PNSetStateResult) + assert envelope.result.state['name'] == "Alex" + assert envelope.result.state['count'] == 5 - result = pubnub.get_state().channels([ch1, ch2]).sync() + envelope = pubnub.get_state().channels([ch1, ch2]).sync() - assert isinstance(result, PNGetStateResult) - assert result.channels[ch1]['name'] == "Alex" - assert result.channels[ch1]['count'] == 5 - assert result.channels[ch2]['name'] == "Alex" - assert result.channels[ch2]['count'] == 5 + assert isinstance(envelope.result, PNGetStateResult) + assert envelope.result.channels[ch1]['name'] == "Alex" + assert envelope.result.channels[ch1]['count'] == 5 + assert envelope.result.channels[ch2]['name'] == "Alex" + assert envelope.result.channels[ch2]['count'] == 5 From 7ce61b0660580195815967ae3e2b5a2c6ff9c73d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 29 Jul 2016 06:40:34 -0700 Subject: [PATCH 237/468] Ignore async/await tests by pypy --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index c8c0f9e2..34a052cf 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -35,6 +35,6 @@ def run(command): elif version.startswith('3.6'): run('py.test --cov=../pubnub --ignore=integrational/twisted/') elif version.startswith('pypy'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/') + run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') else: raise Exception("Version %s is not supported by this script runner" % version) From 68fde4402be7f53aabd62b431196591fec1fafe8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 30 Jul 2016 01:50:41 -0700 Subject: [PATCH 238/468] Add urllib2/urllib requests handler for native platform --- pubnub/pubnub.py | 4 +- pubnub/request_handlers/urllib2_handler.py | 257 +++++++++++++++++++++ pubnub/structures.py | 4 +- tests/helper.py | 20 ++ 4 files changed, 281 insertions(+), 4 deletions(-) create mode 100644 pubnub/request_handlers/urllib2_handler.py diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 3ff94dac..954e7320 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -44,12 +44,12 @@ def set_request_handler(self, handler): self._request_handler = handler def request_sync(self, endpoint_call_options): - platform_options = PlatformOptions(self.headers, self.config.scheme_and_host()) + platform_options = PlatformOptions(self.headers, self.config) return self._request_handler.sync_request(platform_options, endpoint_call_options) def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event): - platform_options = PlatformOptions(self.headers, self.config.scheme_and_host()) + platform_options = PlatformOptions(self.headers, self.config) return self._request_handler.async_request(endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event) diff --git a/pubnub/request_handlers/urllib2_handler.py b/pubnub/request_handlers/urllib2_handler.py new file mode 100644 index 00000000..ebb897b2 --- /dev/null +++ b/pubnub/request_handlers/urllib2_handler.py @@ -0,0 +1,257 @@ +import json +import logging +import socket +import threading + +from six.moves import urllib + +from pubnub import utils +from pubnub.enums import PNStatusCategory +from pubnub.errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_CLIENT_TIMEOUT, \ + PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR +from pubnub.errors import PNERR_SERVER_ERROR +from pubnub.exceptions import PubNubException +from pubnub.request_handlers.base import BaseRequestHandler +from pubnub.structures import RequestOptions, PlatformOptions, ResponseInfo, Envelope + +logger = logging.getLogger("pubnub") + + +class Urllib2RequestHandler(BaseRequestHandler): + """ + PubNub Python SDK Native requests handler based on `urllib2/urllib` native HTTP library. + + Do not use this helper since it's doesnt finished yet. Treat it as an example how to write a custom + handler for PubNub SDK + """ + ENDPOINT_THREAD_COUNTER = 0 + + def __init__(self): + pass + + def sync_request(self, platform_options, endpoint_call_options): + return self._build_envelope(platform_options, endpoint_call_options) + + def async_request(self, endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event): + call = Call() + + def callback_to_invoke_in_another_thread(): + try: + envelope = self._build_envelope(platform_options, endpoint_call_options) + if cancellation_event is not None and cancellation_event.isSet(): + # Since there are no way to affect on ongoing request it's response will + # be just ignored on cancel call + return + + callback(envelope) + except PubNubException as e: + callback(Envelope( + result=None, + status=endpoint_call_options.create_status( + category=PNStatusCategory.PNBadRequestCategory, + response=None, + response_info=None, + exception=e))) + except Exception as e: + # TODO: log the exception + callback(Envelope( + result=None, + status=endpoint_call_options.create_status( + category=PNStatusCategory.PNInternalExceptionCategory, + response=None, + response_info=None, + exception=e))) + finally: + call.executed_cb() + + client = AsyncHTTPClient(callback_to_invoke_in_another_thread) + + thread = threading.Thread( + target=client.run, + name="EndpointThread-%s-%d" % (endpoint_name, ++Urllib2RequestHandler.ENDPOINT_THREAD_COUNTER) + ) + thread.setDaemon(True) + thread.start() + + call.thread = thread + call.cancellation_event = cancellation_event + + return call + + def _build_envelope(self, p_options, e_options): + """ A wrapper for _invoke_url to separate request logic """ + + status_category = PNStatusCategory.PNUnknownCategory + response_info = None + + try: + res = self._invoke_request(p_options, e_options) + except PubNubException as e: + if e._pn_error is PNERR_CONNECTION_ERROR: + status_category = PNStatusCategory.PNUnexpectedDisconnectCategory + elif e._pn_error is PNERR_CLIENT_TIMEOUT: + status_category = PNStatusCategory.PNTimeoutCategory + + return Envelope( + result=None, + status=e_options.create_status( + category=status_category, + response=None, + response_info=response_info, + exception=e)) + + if res is not None: + url = utils.urlparse(res.url) + query = utils.parse_qs(url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=res.code, + tls_enabled='https' == url.scheme, + origin=url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=None + ) + + decoded_text = res.read().decode('utf-8') + decoded_json = json.loads(decoded_text) + logger.debug("GOT %s" % decoded_text) + + if res.code != 200: + if res.code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if res.code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if decoded_json is None: + text = "N/A" + else: + text = decoded_json + + if res.status_code >= 500: + err = PNERR_SERVER_ERROR + else: + err = PNERR_CLIENT_ERROR + + return Envelope( + result=e_options.create_response(decoded_json), + status=e_options.create_status( + category=status_category, + response=decoded_json, + response_info=response_info, + exception=PubNubException( + pn_error=err, + errormsg=text, + status_code=res.status_code + ))) + else: + + return Envelope( + result=e_options.create_response(decoded_json), + status=e_options.create_status( + category=PNStatusCategory.PNAcknowledgmentCategory, + response=decoded_json, + response_info=response_info, + exception=None)) + + @staticmethod + def _invoke_request(p_options, e_options): + assert isinstance(p_options, PlatformOptions) + assert isinstance(e_options, RequestOptions) + + url = utils.build_url(p_options.pn_config.scheme(), p_options.pn_config.origin, + e_options.path, e_options.query_string) + + args = { + "method": e_options.method_string, + 'headers': p_options.headers, + "url": url, + 'params': e_options.query_string, + 'timeout': (e_options.connect_timeout, e_options.request_timeout) + } + + if e_options.is_post(): + args['data'] = e_options.data + logger.debug("%s %s %s" % (e_options.method_string, url, e_options.data)) + else: + logger.debug("%s %s" % (e_options.method_string, url)) + + try: + req = urllib.request.Request(url, e_options.data, p_options.headers) + res = urllib.request.urlopen(req) + except urllib.error.URLError as e: + # For Python 2.6 + if isinstance(e.reason, socket.timeout): + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + else: + # TODO: wrap + raise + + except urllib.error.HTTPError as e: + raise PubNubException( + pn_error=PNERR_HTTP_ERROR, + errormsg=str(e) + ) + except socket.timeout as e: + raise PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + except Exception as e: + raise PubNubException( + pn_error=PNERR_UNKNOWN_ERROR, + errormsg=str(e) + ) + + return res + + +class AsyncHTTPClient: + """A wrapper for threaded calls""" + + def __init__(self, callback_to_invoke): + self._callback_to_invoke = callback_to_invoke + + def run(self): + self._callback_to_invoke() + + +class Call(object): + """ + A platform dependent representation of async PubNub method call + """ + + def __init__(self): + self.thread = None + self.cancellation_event = None + self.is_executed = False + self.is_canceled = False + + def cancel(self): + """ + Set Event flag to stop thread on timeout. This will not stop thread immediately, it will stopped + only after ongoing request will be finished + :return: nothing + """ + if self.cancellation_event is not None: + self.cancellation_event.set() + self.is_canceled = True + + def join(self): + if isinstance(self.thread, threading.Thread): + self.thread.join() + + def executed_cb(self): + self.is_executed = True diff --git a/pubnub/structures.py b/pubnub/structures.py index c25cd73f..e7eb04ed 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -50,9 +50,9 @@ def query_string(self): class PlatformOptions(object): - def __init__(self, headers, scheme_and_host): + def __init__(self, headers, pn_config): self.headers = headers - self.scheme_and_host = scheme_and_host + self.pn_config = pn_config class ResponseInfo(object): diff --git a/tests/helper.py b/tests/helper.py index b3659d35..b33ef268 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -153,9 +153,29 @@ def publish_object_matcher(r1, r2): return True +def check_the_difference_matcher(r1, r2): + """ A helper to check the difference between two requests """ + + try: + assert r1.body == r2.body + assert r1.headers == r2.headers + assert r1.host == r2.host + assert r1.method == r2.method + assert r1.query == r2.query + assert r1.port == r2.port + assert r1.protocol == r2.protocol + assert r1.scheme == r2.scheme + assert r1.path == r2.path + except AssertionError: + return False + + return True + + pn_vcr.register_matcher('meta_object_in_query', meta_object_in_query_matcher) pn_vcr.register_matcher('state_object_in_query', state_object_in_query_matcher) pn_vcr.register_matcher('publish_object', publish_object_matcher) +pn_vcr.register_matcher('check_the_difference', check_the_difference_matcher) def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): From afccc90fc39ffed993952f0a32de1b432f1ba4d0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 30 Jul 2016 02:24:36 -0700 Subject: [PATCH 239/468] Fix RequestOptions compatibility --- pubnub/request_handlers/requests_handler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index 5fd178c1..2e434910 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -155,7 +155,7 @@ def _invoke_request(self, p_options, e_options): assert isinstance(p_options, PlatformOptions) assert isinstance(e_options, RequestOptions) - url = p_options.scheme_and_host + e_options.path + url = p_options.pn_config.scheme_and_host() + e_options.path args = { "method": e_options.method_string, @@ -170,14 +170,14 @@ def _invoke_request(self, p_options, e_options): logger.debug("%s %s %s" % ( e_options.method_string, utils.build_url( - p_options.scheme_and_host, + p_options.pn_config.scheme_and_host(), e_options.path, e_options.query_string), e_options.data)) else: logger.debug("%s %s" % ( e_options.method_string, utils.build_url( - p_options.scheme_and_host, + p_options.pn_config.scheme_and_host(), e_options.path, e_options.query_string))) From d5930981d221cb1951ef66d96aaeca25a36b7a60 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 30 Jul 2016 02:24:53 -0700 Subject: [PATCH 240/468] Add native ssl test --- .../fixtures/native_sync/ssl/ssl.yaml | 22 ++++++++++++++ tests/integrational/native_sync/test_ssl.py | 29 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 tests/integrational/fixtures/native_sync/ssl/ssl.yaml create mode 100644 tests/integrational/native_sync/test_ssl.py diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml new file mode 100644 index 00000000..763e07ed --- /dev/null +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -0,0 +1,22 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + response: + body: {string: '[1,"Sent","14698699475874207"]'} + headers: + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['30'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Sat, 30 Jul 2016 09:12:27 GMT'] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/native_sync/test_ssl.py b/tests/integrational/native_sync/test_ssl.py new file mode 100644 index 00000000..ad6d5f00 --- /dev/null +++ b/tests/integrational/native_sync/test_ssl.py @@ -0,0 +1,29 @@ +import logging +import unittest +import pubnub + +from pubnub.exceptions import PubNubException +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pubnub import PubNub +from tests.helper import pn_vcr, pnconf_copy + +pubnub.set_stream_logger('pubnub', logging.DEBUG) + + +class TestPubNubPublish(unittest.TestCase): + @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/ssl/ssl.yaml', + filter_query_parameters=['uuid']) + def test_publish_string_get(self): + pnconf = pnconf_copy() + pnconf.ssl = True + try: + env = PubNub(pnconf).publish() \ + .channel("ch1") \ + .message("hi") \ + .sync() + + assert isinstance(env.result, PNPublishResult) + assert env.result.timetoken > 1 + except PubNubException as e: + self.fail(e) + From 7c7c16be18774f1c3610a995ee5fe915a9f6109e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 31 Jul 2016 12:55:43 -0700 Subject: [PATCH 241/468] Add SSL tests --- pubnub/pubnub_asyncio.py | 15 +++++++++--- tests/helper.py | 10 ++++++++ tests/integrational/asyncio/test_ssl.py | 18 ++++++++++++++ tests/integrational/tornado/test_ssl.py | 32 +++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 tests/integrational/asyncio/test_ssl.py create mode 100644 tests/integrational/tornado/test_ssl.py diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 28dba4d7..9c1fa2ee 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -29,9 +29,11 @@ class PubNubAsyncio(PubNubCore): def __init__(self, config, custom_event_loop=None): super(PubNubAsyncio, self).__init__(config) self.event_loop = custom_event_loop or asyncio.get_event_loop() - # TODO: add proxies and option to reinitialize connector&session - self._connector = aiohttp.BaseConnector(conn_timeout=config.connect_timeout) - self._session = aiohttp.ClientSession(loop=self.event_loop) + + self._connector = None + self._session = None + + self.set_connector(aiohttp.TCPConnector(conn_timeout=config.connect_timeout, verify_ssl=True)) if self.config.enable_subscribe: self._subscription_manager = AsyncioSubscriptionManager(self) @@ -39,6 +41,13 @@ def __init__(self, config, custom_event_loop=None): # TODO: replace with platform-specific manager self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + def set_connector(self, cn): + if self._session is not None and self._session.closed: + self._session.close() + + self._connector = cn + self._session = aiohttp.ClientSession(loop=self.event_loop, connector=self._connector) + def stop(self): self._session.close() if self._subscription_manager is not None: diff --git a/tests/helper.py b/tests/helper.py index b33ef268..4ef3a5e8 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -48,6 +48,11 @@ pnconf_pam.secret_key = sec_key_pam pnconf_pam.enable_subscribe = False +pnconf_ssl = PNConfiguration() +pnconf_ssl.publish_key = pub_key +pnconf_ssl.subscribe_key = sub_key +pnconf_ssl.ssl = True + def pnconf_copy(): return copy(pnconf) @@ -68,6 +73,11 @@ def pnconf_enc_copy(): def pnconf_pam_copy(): return copy(pnconf_pam) + +def pnconf_ssl_copy(): + return copy(pnconf_ssl) + + sdk_name = "Python-UnitTest" diff --git a/tests/integrational/asyncio/test_ssl.py b/tests/integrational/asyncio/test_ssl.py new file mode 100644 index 00000000..f1ebbb52 --- /dev/null +++ b/tests/integrational/asyncio/test_ssl.py @@ -0,0 +1,18 @@ +import logging + +import pytest +import pubnub as pn + +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException +from tests.helper import pnconf_copy, pnconf_enc_copy, pnconf_ssl_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch = "asyncio-int-publish" + + +@pytest.mark.asyncio +def test_publish_string_via_get_encrypted(event_loop): + pubnub = PubNubAsyncio(pnconf_ssl_copy(), custom_event_loop=event_loop) + res = yield from pubnub.publish().channel(ch).message("hey").future() + assert res.result.timetoken > 0 diff --git a/tests/integrational/tornado/test_ssl.py b/tests/integrational/tornado/test_ssl.py new file mode 100644 index 00000000..55463de6 --- /dev/null +++ b/tests/integrational/tornado/test_ssl.py @@ -0,0 +1,32 @@ +import logging +import tornado +import pubnub as pn + +from tornado.testing import AsyncTestCase +from pubnub.models.consumer.common import PNStatus +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope +from tests.helper import pnconf_ssl_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch = "tornado-int-publish" + + +class TestPubNubAsyncPublish(AsyncTestCase): + @tornado.testing.gen_test + def test_publish_ssl(self): + pubnub = PubNubTornado(pnconf_ssl_copy()) + pubnub.set_ioloop(self.io_loop) + msg = "hey" + pub = pubnub.publish().channel(ch).message(msg) + + envelope = yield pub.future() + + assert isinstance(envelope, TornadoEnvelope) + assert isinstance(envelope.result, PNPublishResult) + assert isinstance(envelope.status, PNStatus) + assert envelope.result.timetoken > 0 + assert len(envelope.status.original_response) > 0 + + pubnub.stop() From 863521f785354d84d07f7c46ce6f1cde108b847b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 1 Aug 2016 13:03:48 -0700 Subject: [PATCH 242/468] Fix subscribe message decryption --- pubnub/enums.py | 1 + pubnub/models/server/subscribe.py | 1 + pubnub/utils.py | 1 + pubnub/workers.py | 5 ++- tests/helper.py | 4 +- tests/integrational/asyncio/test_subscribe.py | 41 ++++++++++++++++++- 6 files changed, 48 insertions(+), 5 deletions(-) diff --git a/pubnub/enums.py b/pubnub/enums.py index 931ed018..7243eedc 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -66,6 +66,7 @@ class PNReconnectionPolicy(object): NONE = 1 LINEAR = 2 + class PNPushType(object): APNS = 1 MPNS = 2 diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 263dd96b..311ac3e6 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -13,6 +13,7 @@ def __init__(self, messages=None, metadata=None): def from_json(cls, json_input): messages = [] if json_input is None: + # TODO: handle print("blah") for raw_message in json_input['m']: messages.append(SubscribeMessage.from_json(raw_message)) diff --git a/pubnub/utils.py b/pubnub/utils.py index a34971d8..330fef60 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -165,6 +165,7 @@ def sign_sha256(secret, sign_input): return sign.decode("utf-8") + def push_type_to_string(push_type): if push_type == PNPushType.APNS: return "apns" diff --git a/pubnub/workers.py b/pubnub/workers.py index 3c9d2aa8..0e92b08d 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -1,6 +1,7 @@ import logging -from abc import abstractmethod +from pubnub import crypto as pn_crypto +from abc import abstractmethod from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult from .models.server.subscribe import SubscribeMessage, PresenceEnvelope @@ -30,7 +31,7 @@ def _process_message(self, message_input): if self._pubnub.config.cipher_key is None: return message_input else: - return "TODO: implement cipher decoding" + return pn_crypto.decrypt(self._pubnub.config.cipher_key, message_input) def _process_incoming_payload(self, message): assert isinstance(message, SubscribeMessage) diff --git a/tests/helper.py b/tests/helper.py index 4ef3a5e8..a67cbd13 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -66,8 +66,8 @@ def pnconf_sub_copy(): return copy(pnconf_sub) -def pnconf_enc_copy(): - return copy(pnconf_enc) +def pnconf_enc_sub_copy(): + return copy(pnconf_enc_sub) def pnconf_pam_copy(): diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index f9b3fda4..84f433ca 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -6,7 +6,7 @@ from pubnub.models.consumer.pubsub import PNMessageResult from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener from tests import helper -from tests.helper import pnconf_sub_copy +from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy pn.set_stream_logger('pubnub', logging.DEBUG) @@ -68,6 +68,45 @@ def test_subscribe_publish_unsubscribe(event_loop): pubnub.stop() +@pytest.mark.asyncio +def test_encrypted_subscribe_publish_unsubscribe(event_loop): + pubnub = PubNubAsyncio(pnconf_enc_sub_copy(), custom_event_loop=event_loop) + + callback = SubscribeListener() + channel = helper.gen_channel("test-sub-pub-unsub") + message = "hey" + pubnub.add_listener(callback) + pubnub.subscribe().channels(channel).execute() + + yield from callback.wait_for_connect() + + publish_future = asyncio.ensure_future(pubnub.publish().channel(channel).message(message).future()) + subscribe_message_future = asyncio.ensure_future(callback.wait_for_message_on(channel)) + + yield from asyncio.wait([ + publish_future, + subscribe_message_future + ]) + + publish_envelope = publish_future.result() + subscribe_envelope = subscribe_message_future.result() + + assert isinstance(subscribe_envelope, PNMessageResult) + assert subscribe_envelope.actual_channel == channel + assert subscribe_envelope.subscribed_channel == channel + assert subscribe_envelope.message == message + assert subscribe_envelope.timetoken > 0 + + assert isinstance(publish_envelope, AsyncioEnvelope) + assert publish_envelope.result.timetoken > 0 + assert publish_envelope.status.original_response[0] == 1 + + pubnub.unsubscribe().channels(channel).execute() + yield from callback.wait_for_disconnect() + + pubnub.stop() + + @pytest.mark.asyncio def test_join_leave(event_loop): channel = helper.gen_channel("test-subscribe-join-leave") From a92a73d69d074de5e34557bb920ac3b7eefeed7c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 1 Aug 2016 13:23:31 -0700 Subject: [PATCH 243/468] Add Native Publish Sequence Manager --- pubnub/managers.py | 2 +- pubnub/pubnub.py | 15 +++++++++++++++ pubnub/workers.py | 6 ------ tests/integrational/asyncio/test_subscribe.py | 2 +- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index 6b26779d..83f004ea 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -13,7 +13,7 @@ def __init__(self, provided_max_sequence): self.max_sequence = provided_max_sequence self.next_sequence = 0 - # TODO: should be thread-safe + @abstractmethod def get_next_sequence(self): if self.max_sequence == self.next_sequence: self.next_sequence = 1 diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 954e7320..12ba2d3c 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -68,6 +68,21 @@ def add_listener(self, listener): self._subscription_manager.add_listener(listener) +class NativePublishSequenceManager(PublishSequenceManager): + def __init__(self, provided_max_sequence): + super(NativePublishSequenceManager, self).__init__(provided_max_sequence) + self._lock = threading.Lock() + + def get_next_sequence(self): + with self._lock: + if self.max_sequence == self.next_sequence: + self.next_sequence = 1 + else: + self.next_sequence += 1 + + return self.next_sequence + + class NativeSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): self._message_queue = Queue() diff --git a/pubnub/workers.py b/pubnub/workers.py index 0e92b08d..5142eae9 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -40,12 +40,6 @@ def _process_incoming_payload(self, message): subscription_match = message.subscription_match publish_meta_data = message.publish_metadata - # if channel == subscription_match: - # subscription_match = None - - # if message.only_channel_subscription: - # channel = subscription_match - if "-pnpres" in message.channel: presence_payload = PresenceEnvelope.from_json_payload(message.payload) pn_presence_event_result = PNPresenceEventResult( diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 84f433ca..f0c2a36c 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -1,8 +1,8 @@ import logging - import asyncio import pytest import pubnub as pn + from pubnub.models.consumer.pubsub import PNMessageResult from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener from tests import helper From b460cd264c591cf5772b61cc1c16246eecbde6a4 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 2 Aug 2016 02:50:29 -0700 Subject: [PATCH 244/468] Add Tornado Sequence Manager --- pubnub/pubnub_tornado.py | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 3bae99a2..31428c88 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -11,7 +11,7 @@ from tornado import stack_context from tornado.concurrent import Future from tornado.ioloop import PeriodicCallback -from tornado.locks import Event, Semaphore +from tornado.locks import Event, Semaphore, Lock from tornado.log import gen_log from tornado.queues import Queue from tornado.simple_httpclient import SimpleAsyncHTTPClient @@ -103,8 +103,8 @@ def __init__(self, config, custom_ioloop=None): if self.config.enable_subscribe: self._subscription_manager = TornadoSubscriptionManager(self) - # TODO: replace with platform-specific manager - self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + self._publish_sequence_manager = TornadoPublishSequenceManager(self.ioloop, + PubNubCore.MAX_SEQUENCE) # TODO: choose a correct client here http://www.tornadoweb.org/en/stable/httpclient.html # TODO: 1000? self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) @@ -121,7 +121,6 @@ def add_listener(self, listener): else: raise Exception("Subscription manager is not enabled for this instance") - # TODO: extract this into a separate class def request_sync(self, *args): raise NotImplementedError @@ -266,6 +265,26 @@ def response_callback(response): return key_future +class TornadoPublishSequenceManager(PublishSequenceManager): + def __init__(self, ioloop, provided_max_sequence): + super(TornadoPublishSequenceManager, self).__init__(provided_max_sequence) + self._lock = Lock() + self._ioloop = ioloop + + def get_next_sequence(self): + @tornado.gen.coroutine + def wrapper(): + with (yield self._lock.acquire()): + if self.max_sequence == self.next_sequence: + self.next_sequence = 1 + else: + self.next_sequence += 1 + + raise tornado.gen.Return(self.next_sequence) + + return self._ioloop.run_sync(wrapper) + + class TornadoSubscribeMessageWorker(SubscribeMessageWorker): @tornado.gen.coroutine def run(self): From 2d7a5c85dfa1d232cee1815679140c4bd6f2d8ae Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 2 Aug 2016 06:11:24 -0700 Subject: [PATCH 245/468] Fix Asyncio publish sequence manager --- pubnub/endpoints/endpoint.py | 6 +++-- pubnub/endpoints/presence/here_now.py | 2 +- pubnub/endpoints/pubsub/publish.py | 5 +--- pubnub/pubnub_asyncio.py | 26 ++++++++++++++++++--- pubnub/pubnub_core.py | 2 +- pubnub/structures.py | 3 ++- tests/integrational/asyncio/test_publish.py | 16 +++++++++++++ 7 files changed, 48 insertions(+), 12 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index bfbcb4bf..8beca7ab 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -51,7 +51,7 @@ def create_response(self, endpoint): @abstractmethod def operation_type(self): - pass + raise NotImplementedError @abstractmethod def name(self): @@ -74,7 +74,9 @@ def affected_channels_groups(self): def options(self): return RequestOptions(self.build_path(), self.build_params(), self.http_method(), self.request_timeout(), - self.connect_timeout(), self.create_response, self.create_status_response, + self.connect_timeout(), self.create_response, + self.create_status_response, + self.operation_type(), self.build_data(), self._sort_params) def sync(self): diff --git a/pubnub/endpoints/presence/here_now.py b/pubnub/endpoints/presence/here_now.py index c9c7a6ea..60beb4e0 100755 --- a/pubnub/endpoints/presence/here_now.py +++ b/pubnub/endpoints/presence/here_now.py @@ -68,7 +68,7 @@ def connect_timeout(self): return self.pubnub.config.connect_timeout def operation_type(self): - return PNOperationType.PNPublishOperation + return PNOperationType.PNHereNowOperation def name(self): return "HereNow" diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 01cf1891..fa0a234f 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -12,9 +12,8 @@ class Publish(Endpoint): PUBLISH_GET_PATH = "/publish/%s/%s/0/%s/%s/%s" PUBLISH_POST_PATH = "/publish/%s/%s/0/%s/%s" - def __init__(self, pubnub, publish_sequence_manager): + def __init__(self, pubnub): Endpoint.__init__(self, pubnub) - self.publish_sequence_manager = publish_sequence_manager self._channel = None self._message = None self._should_store = None @@ -66,8 +65,6 @@ def build_params(self): if self.pubnub.config.auth_key is not None: params["auth"] = utils.url_encode(self.pubnub.config.auth_key) - params['seqn'] = str(self.publish_sequence_manager.get_next_sequence()) - return params def build_path(self): diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 9c1fa2ee..bdc00737 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -13,7 +13,7 @@ from .managers import SubscriptionManager, PublishSequenceManager from . import utils from .structures import ResponseInfo -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType from .callbacks import SubscribeCallback from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED from .exceptions import PubNubException @@ -38,8 +38,8 @@ def __init__(self, config, custom_event_loop=None): if self.config.enable_subscribe: self._subscription_manager = AsyncioSubscriptionManager(self) - # TODO: replace with platform-specific manager - self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + self._publish_sequence_manager = AsyncioPublishSequenceManager(self.event_loop, + PubNubCore.MAX_SEQUENCE) def set_connector(self, cn): if self._session is not None and self._session.closed: @@ -80,6 +80,9 @@ def request_future(self, intermediate_key_future, options_func, create_response, options = options_func() + if options.operation_type is PNOperationType.PNPublishOperation: + options.params['seqn'] = yield from self._publish_sequence_manager.get_next_sequence() + url = utils.build_url(self.config.scheme(), self.config.origin, options.path) log_url = utils.build_url(self.config.scheme(), self.config.origin, options.path, options.query_string) @@ -185,6 +188,23 @@ def request_future(self, intermediate_key_future, options_func, create_response, ) +class AsyncioPublishSequenceManager(PublishSequenceManager): + def __init__(self, ioloop, provided_max_sequence): + super(AsyncioPublishSequenceManager, self).__init__(provided_max_sequence) + self._lock = asyncio.Lock() + self._event_loop = ioloop + + @asyncio.coroutine + def get_next_sequence(self): + with (yield from self._lock): + if self.max_sequence == self.next_sequence: + self.next_sequence = 1 + else: + self.next_sequence += 1 + + return self.next_sequence + + class AsyncioSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): self._message_queue = Queue() diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 6be5bb4a..c6321600 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -98,7 +98,7 @@ def where_now(self): return WhereNow(self) def publish(self): - return Publish(self, self._publish_sequence_manager) + return Publish(self) def grant(self): return Grant(self) diff --git a/pubnub/structures.py b/pubnub/structures.py index e7eb04ed..9bb64b18 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -5,7 +5,7 @@ class RequestOptions(object): def __init__(self, path, params, method, request_timeout, connect_timeout, create_response, - create_status, data=None, sort_arguments=False): + create_status, operation_type, data=None, sort_arguments=False): assert len(path) > 0 assert isinstance(params, dict) assert isinstance(method, six.integer_types) @@ -24,6 +24,7 @@ def __init__(self, path, params, method, request_timeout, connect_timeout, creat self.create_response = create_response self.create_status = create_status + self.operation_type = operation_type @property def method_string(self): diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index 5fe5d51f..0885d028 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -55,6 +55,8 @@ def test_publish_string_via_get(event_loop): asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"])), asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))) + pubnub.stop() + @pytest.mark.asyncio def test_publish_string_via_post(event_loop): @@ -66,6 +68,8 @@ def test_publish_string_via_post(event_loop): asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"])), asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))) + pubnub.stop() + @pytest.mark.asyncio def test_publish_string_via_get_encrypted(event_loop): @@ -77,6 +81,8 @@ def test_publish_string_via_get_encrypted(event_loop): asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"])), asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))) + pubnub.stop() + @pytest.mark.asyncio def test_publish_string_via_post_encrypted(event_loop): @@ -88,18 +94,24 @@ def test_publish_string_via_post_encrypted(event_loop): asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"])), asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))) + pubnub.stop() + @pytest.mark.asyncio def test_error_missing_message(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) yield from assert_client_side_error(pubnub.publish().channel(ch).message(None), "Message missing") + pubnub.stop() + @pytest.mark.asyncio def test_error_missing_channel(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) yield from assert_client_side_error(pubnub.publish().channel("").message("hey"), "Channel missing") + pubnub.stop() + @pytest.mark.asyncio def test_error_non_serializable(event_loop): @@ -109,6 +121,7 @@ def method(): pass yield from assert_client_side_error(pubnub.publish().channel(ch).message(method), "not JSON serializable") + pubnub.stop() @pytest.mark.asyncio @@ -116,6 +129,7 @@ def test_publish_with_meta(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) yield from assert_success_await(pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + pubnub.stop() @pytest.mark.asyncio @@ -123,6 +137,7 @@ def test_publish_do_not_store(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) yield from assert_success_await(pubnub.publish().channel(ch).message("hey").should_store(False)) + pubnub.stop() @pytest.mark.asyncio @@ -143,4 +158,5 @@ def test_error_invalid_key(event_loop): pubnub = PubNubAsyncio(conf, custom_event_loop=event_loop) yield from assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "Invalid Key") + pubnub.stop() From 7cd32da67489b19ca15768d9e9bf9cd57d8ce57c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 2 Aug 2016 23:45:07 -0700 Subject: [PATCH 246/468] Fix Tornado psm --- pubnub/pubnub.py | 8 +++++- pubnub/pubnub_tornado.py | 29 +++++++++----------- pubnub/workers.py | 2 +- tests/functional/test_publish.py | 30 ++++++++++----------- tests/integrational/tornado/test_publish.py | 5 +--- 5 files changed, 36 insertions(+), 38 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 12ba2d3c..66726654 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -12,7 +12,7 @@ from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType from .managers import SubscriptionManager, PublishSequenceManager from .pnconfiguration import PNConfiguration from .pubnub_core import PubNubCore @@ -46,11 +46,17 @@ def set_request_handler(self, handler): def request_sync(self, endpoint_call_options): platform_options = PlatformOptions(self.headers, self.config) + if endpoint_call_options.operation_type is PNOperationType.PNPublishOperation: + endpoint_call_options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + return self._request_handler.sync_request(platform_options, endpoint_call_options) def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event): platform_options = PlatformOptions(self.headers, self.config) + if endpoint_call_options.operation_type is PNOperationType.PNPublishOperation: + endpoint_call_options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + return self._request_handler.async_request(endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 31428c88..6c9dec42 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -20,7 +20,7 @@ from .callbacks import SubscribeCallback from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED from .exceptions import PubNubException from .managers import SubscriptionManager, PublishSequenceManager @@ -103,13 +103,11 @@ def __init__(self, config, custom_ioloop=None): if self.config.enable_subscribe: self._subscription_manager = TornadoSubscriptionManager(self) - self._publish_sequence_manager = TornadoPublishSequenceManager(self.ioloop, - PubNubCore.MAX_SEQUENCE) - # TODO: choose a correct client here http://www.tornadoweb.org/en/stable/httpclient.html + self._publish_sequence_manager = TornadoPublishSequenceManager(PubNubCore.MAX_SEQUENCE) # TODO: 1000? self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) self.id = None - # TODO: add accept encoding should be configurable + self.headers = { 'User-Agent': self.sdk_name, 'Accept-Encoding': 'utf-8' @@ -153,6 +151,10 @@ def request_future_key(self, options_func, create_response, assert isinstance(cancellation_event, Event) options = options_func() + + if options.operation_type is PNOperationType.PNPublishOperation: + options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + key_future = Future() url = utils.build_url(self.config.scheme(), self.config.origin, @@ -266,23 +268,18 @@ def response_callback(response): class TornadoPublishSequenceManager(PublishSequenceManager): - def __init__(self, ioloop, provided_max_sequence): + def __init__(self, provided_max_sequence): super(TornadoPublishSequenceManager, self).__init__(provided_max_sequence) self._lock = Lock() self._ioloop = ioloop def get_next_sequence(self): - @tornado.gen.coroutine - def wrapper(): - with (yield self._lock.acquire()): - if self.max_sequence == self.next_sequence: - self.next_sequence = 1 - else: - self.next_sequence += 1 - - raise tornado.gen.Return(self.next_sequence) + if self.max_sequence == self.next_sequence: + self.next_sequence = 1 + else: + self.next_sequence += 1 - return self._ioloop.run_sync(wrapper) + return self.next_sequence class TornadoSubscribeMessageWorker(SubscribeMessageWorker): diff --git a/pubnub/workers.py b/pubnub/workers.py index 5142eae9..ba599ab2 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -1,6 +1,6 @@ import logging -from pubnub import crypto as pn_crypto +import crypto as pn_crypto from abc import abstractmethod from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult from .models.server.subscribe import SubscribeMessage, PresenceEnvelope diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 1f0f7a95..dcbe303b 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -14,16 +14,19 @@ class TestPublish(unittest.TestCase): def setUp(self): + self.sm = MagicMock( + get_next_sequence=MagicMock(return_value=2) + ) + self.pubnub = MagicMock( spec=PubNub, config=pnconf, - sdk_name=sdk_name - ) - self.sm = MagicMock( - get_next_sequence=MagicMock(return_value=2) + sdk_name=sdk_name, + _publish_sequence_manager=self.sm ) + self.pubnub.uuid = "UUID_PublishUnitTest" - self.pub = Publish(self.pubnub, self.sm) + self.pub = Publish(self.pubnub) def test_pub_message(self): message = "hi" @@ -37,7 +40,6 @@ def test_pub_message(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'seqn': '2' }) def test_pub_list_message(self): @@ -54,7 +56,6 @@ def test_pub_list_message(self): self.assertEqual(self.pub.build_params(), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'seqn': '2' }) def test_pub_with_meta(self): @@ -73,7 +74,6 @@ def test_pub_with_meta(self): 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'meta': '%5B%22m1%22%2C%20%22m2%22%5D', - 'seqn': '2' }) def test_pub_store(self): @@ -91,7 +91,6 @@ def test_pub_store(self): 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'store': '1', - 'seqn': '2' }) def test_pub_do_not_store(self): @@ -109,7 +108,6 @@ def test_pub_do_not_store(self): 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'store': '0', - 'seqn': '2' }) def test_pub_with_auth(self): @@ -120,9 +118,10 @@ def test_pub_with_auth(self): spec=PubNub, config=conf, sdk_name=sdk_name, - uuid="UUID_PublishUnitTest" + uuid="UUID_PublishUnitTest", + _publish_sequence_manager=self.sm ) - pub = Publish(pubnub, self.sm) + pub = Publish(pubnub) message = "hey" encoded_message = url_encode(message) pub.channel("ch1").message(message) @@ -135,7 +134,6 @@ def test_pub_with_auth(self): 'pnsdk': sdk_name, 'uuid': pubnub.uuid, 'auth': conf.auth_key, - 'seqn': '2' }) def test_pub_encrypted_list_message(self): @@ -146,9 +144,10 @@ def test_pub_encrypted_list_message(self): spec=PubNub, config=conf, sdk_name=sdk_name, - uuid="UUID_PublishUnitTest" + uuid="UUID_PublishUnitTest", + _publish_sequence_manager=self.sm ) - pub = Publish(pubnub, self.sm) + pub = Publish(pubnub) message = ["hi", "hi2", "hi3"] encoded_message = "%22FQyKoIWWm7oN27zKyoU0bpjpgx49JxD04EI%2F0a8rg%2Fo%3D%22" @@ -161,6 +160,5 @@ def test_pub_encrypted_list_message(self): self.assertEqual(pub.build_params(), { 'pnsdk': sdk_name, 'uuid': pubnub.uuid, - 'seqn': '2' }) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 8f55f489..19a57216 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -1,12 +1,9 @@ import logging - import tornado -from tornado.concurrent import Future - import pubnub as pn +from tornado.concurrent import Future from tornado.testing import AsyncTestCase - from pubnub.exceptions import PubNubException from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pubsub import PNPublishResult From ab6606a86b1ce3ae2384829ad7a25d3f64e0c5a3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 3 Aug 2016 03:18:34 -0700 Subject: [PATCH 247/468] Fix imports --- pubnub/pubnub.py | 3 ++- pubnub/pubnub_asyncio.py | 5 ++--- pubnub/pubnub_tornado.py | 4 ---- pubnub/workers.py | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 66726654..65138216 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -257,7 +257,8 @@ def _take_message(self): # TODO: move to finally self._queue.task_done() self._event.set() - logger.warn("take message interrupted: %s" % str(e)) + logger.error("take message interrupted: %s" % str(e)) + raise class SubscribeListener(SubscribeCallback): diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index bdc00737..ed43b6d4 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -367,9 +367,8 @@ def _take_message(self): logger.debug("Message Worker cancelled") break except Exception as e: - # TODO: move to finally - logger.warn("take message interrupted: %s" % str(e)) - break + logger.error("take message interrupted: %s" % str(e)) + raise class AsyncioPeriodicCallback(object): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 6c9dec42..88a63d1c 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -89,10 +89,6 @@ def cb(): return cancel - # TODO: deprecate - def set_ioloop(self, ioloop): - self.ioloop = ioloop - def sdk_platform(self): return "-Tornado" diff --git a/pubnub/workers.py b/pubnub/workers.py index ba599ab2..0318d1ce 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -1,6 +1,6 @@ import logging -import crypto as pn_crypto +from . import crypto as pn_crypto from abc import abstractmethod from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult from .models.server.subscribe import SubscribeMessage, PresenceEnvelope From 61b9686c51ed60e6f708cd8bbfa9f53a3b74ff7f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 3 Aug 2016 03:44:06 -0700 Subject: [PATCH 248/468] Fix missing Tornado ioloop assignment --- tests/integrational/tornado/test_publish.py | 28 ++++++++------------- tests/integrational/tornado/test_ssl.py | 3 +-- 2 files changed, 11 insertions(+), 20 deletions(-) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 19a57216..9c72eb8b 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -27,8 +27,6 @@ def callback(self, tornado_res): self.stop() def assert_success(self, pub): - self.pubnub.set_ioloop(self.io_loop) - pub.future().add_done_callback(self.callback) self.pubnub.start() @@ -42,8 +40,6 @@ def assert_success(self, pub): @tornado.testing.gen_test def assert_success_yield(self, pub): - self.pubnub.set_ioloop(self.io_loop) - envelope = yield pub.future() assert isinstance(envelope, TornadoEnvelope) @@ -53,22 +49,22 @@ def assert_success_yield(self, pub): assert len(envelope.status.original_response) > 0 def assert_success_publish_get(self, msg): - self.pubnub = PubNubTornado(pnconf) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) self.assert_success(self.pubnub.publish().channel(ch).message(msg)) self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg)) def assert_success_publish_post(self, msg): - self.pubnub = PubNubTornado(pnconf) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) self.assert_success(self.pubnub.publish().channel(ch).message(msg).use_post(True)) self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg).use_post(True)) def assert_success_publish_get_encrypted(self, msg): - self.pubnub = PubNubTornado(pnconf_enc) + self.pubnub = PubNubTornado(pnconf_enc, custom_ioloop=self.io_loop) self.assert_success(self.pubnub.publish().channel(ch).message(msg)) self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg)) def assert_success_publish_post_encrypted(self, msg): - self.pubnub = PubNubTornado(pnconf_enc) + self.pubnub = PubNubTornado(pnconf_enc, custom_ioloop=self.io_loop) self.assert_success(self.pubnub.publish().channel(ch).message(msg).use_post(True)) self.assert_success_yield(self.pubnub.publish().channel(ch).message(msg).use_post(True)) @@ -113,20 +109,17 @@ def test_publish_string_via_post_encrypted(self): self.assert_success_publish_post_encrypted({"name": "Alex", "online": True}) def test_error_missing_message(self): - self.pubnub = PubNubTornado(pnconf) - self.pubnub.set_ioloop(self.io_loop) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) self.assert_client_side_error(self.pubnub.publish().channel(ch).message(None), "Message missing") def test_error_missing_channel(self): - self.pubnub = PubNubTornado(pnconf) - self.pubnub.set_ioloop(self.io_loop) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) self.assert_client_side_error(self.pubnub.publish().channel("").message("hey"), "Channel missing") def test_error_non_serializable(self): - self.pubnub = PubNubTornado(pnconf) - self.pubnub.set_ioloop(self.io_loop) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) def method(): pass @@ -169,14 +162,13 @@ def test_error_invalid_key(self): conf.publish_key = "fake" conf.subscribe_key = "demo" - self.pubnub = PubNubTornado(conf) - self.pubnub.set_ioloop(self.io_loop) + self.pubnub = PubNubTornado(conf, custom_ioloop=self.io_loop) self.assert_server_side_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") self.assert_server_side_error_yield(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") def test_publish_with_meta(self): - self.pubnub = PubNubTornado(pnconf) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) self.assert_success( self.pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) @@ -184,7 +176,7 @@ def test_publish_with_meta(self): self.pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) def test_publish_do_not_store(self): - self.pubnub = PubNubTornado(pnconf) + self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) self.assert_success( self.pubnub.publish().channel(ch).message("hey").should_store(False)) diff --git a/tests/integrational/tornado/test_ssl.py b/tests/integrational/tornado/test_ssl.py index 55463de6..3902833f 100644 --- a/tests/integrational/tornado/test_ssl.py +++ b/tests/integrational/tornado/test_ssl.py @@ -16,8 +16,7 @@ class TestPubNubAsyncPublish(AsyncTestCase): @tornado.testing.gen_test def test_publish_ssl(self): - pubnub = PubNubTornado(pnconf_ssl_copy()) - pubnub.set_ioloop(self.io_loop) + pubnub = PubNubTornado(pnconf_ssl_copy(), custom_ioloop=self.io_loop) msg = "hey" pub = pubnub.publish().channel(ch).message(msg) From 90cbe9878ab23910bc3f20e3e0ca5f46b860080e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 4 Aug 2016 03:47:37 -0700 Subject: [PATCH 249/468] Rename Tornado customized client name --- pubnub/pubnub_tornado.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 88a63d1c..c2e705ab 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -31,7 +31,7 @@ logger = logging.getLogger("pubnub") -class TornadoCurlAsyncHTTPClient(SimpleAsyncHTTPClient): +class PubNubTornadoSimpleAsyncHTTPClient(SimpleAsyncHTTPClient): def reset_request(self, key_object): if key_object in self.waiting: self.io_loop.add_callback(self._on_timeout, key_object) @@ -65,7 +65,7 @@ def __init__(self, key, after_key_callback): self.continue_callback = after_key_callback -tornado.httpclient.AsyncHTTPClient.configure(TornadoCurlAsyncHTTPClient) +tornado.httpclient.AsyncHTTPClient.configure(PubNubTornadoSimpleAsyncHTTPClient) class PubNubTornado(PubNubCore): From eb49f0140d7e2e084fd2742f90b8fcf568fa9372 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 4 Aug 2016 04:39:52 -0700 Subject: [PATCH 250/468] Cleanup --- pubnub/pubnub_asyncio.py | 21 +++++++++------------ pubnub/pubnub_tornado.py | 7 +++++-- pubnub/structures.py | 3 ++- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index ed43b6d4..1ae4038c 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -74,7 +74,7 @@ def request_deferred(self, *args): @asyncio.coroutine def request_future(self, intermediate_key_future, options_func, create_response, - create_status_response, cancellation_event): + create_status_response, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -95,12 +95,10 @@ def request_future(self, intermediate_key_future, options_func, create_response, headers=self.headers, data=options.data if options.data is not None else None), options.request_timeout) - except asyncio.TimeoutError: - raise - except asyncio.CancelledError: + except (asyncio.TimeoutError, asyncio.CancelledError): raise except Exception as e: - print('regular error', str(e)) + logger.error("Request await error: %s" % str(e)) raise body = yield from response.text() @@ -270,11 +268,11 @@ def _start_subscribe_loop(self): self._pubnub.event_loop.call_soon(self._start_subscribe_loop) else: self._listener_manager.announce_status(e.status) - except asyncio.CancelledError as e: - print('cancelled') + except asyncio.CancelledError: + pass except Exception as e: - print('error in subscribe loop:', str(e)) - raise e + logger.error("Exception in subscribe loop: %s" % str(e)) + raise finally: self._subscription_lock.release() @@ -331,6 +329,7 @@ def _perform_heartbeat_loop(self): except PubNubAsyncioException as e: pass + # TODO: check correctness # if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: # self._start_subscribe_loop() # else: @@ -397,8 +396,7 @@ def _run(self): try: asyncio.ensure_future(self._callback()) except Exception: - # TODO: handle the exception - pass + raise finally: self._schedule_next() @@ -407,7 +405,6 @@ def _schedule_next(self): if self._next_timeout <= current_time: callback_time_sec = self._callback_time / 1000.0 - print("cb time", callback_time_sec) self._next_timeout += (math.floor( (current_time - self._next_timeout) / callback_time_sec) + 1) * callback_time_sec diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index c2e705ab..5380cb42 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -69,6 +69,8 @@ def __init__(self, key, after_key_callback): class PubNubTornado(PubNubCore): + MAX_CLIENTS = 1000 + def stop(self): self.ioloop.stop() @@ -100,8 +102,8 @@ def __init__(self, config, custom_ioloop=None): self._subscription_manager = TornadoSubscriptionManager(self) self._publish_sequence_manager = TornadoPublishSequenceManager(PubNubCore.MAX_SEQUENCE) - # TODO: 1000? - self.http = tornado.httpclient.AsyncHTTPClient(max_clients=1000) + + self.http = tornado.httpclient.AsyncHTTPClient(max_clients=PubNubTornado.MAX_CLIENTS) self.id = None self.headers = { @@ -409,6 +411,7 @@ def _perform_heartbeat_loop(self): except PubNubTornadoException as e: pass + # TODO: check correctness # if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: # self._start_subscribe_loop() # else: diff --git a/pubnub/structures.py b/pubnub/structures.py index 9bb64b18..48214fc6 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -18,8 +18,9 @@ def __init__(self, path, params, method, request_timeout, connect_timeout, creat self._method = method self.request_timeout = request_timeout self.connect_timeout = connect_timeout - # TODO: rename to 'body' + # TODO: rename 'data' => 'body' self.data = data + self.body = data self.sort_params = sort_arguments self.create_response = create_response From 062115dde56ea65c242a65e8f67091c2148456cc Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 4 Aug 2016 08:26:14 -0700 Subject: [PATCH 251/468] Utils refactoring --- pubnub/pubnub_asyncio.py | 7 +++-- pubnub/pubnub_tornado.py | 5 ++-- pubnub/request_handlers/requests_handler.py | 5 ++-- pubnub/request_handlers/urllib2_handler.py | 5 ++-- pubnub/utils.py | 27 +------------------ tests/integrational/asyncio/test_where_now.py | 2 +- tests/integrational/tornado/test_where_now.py | 2 +- 7 files changed, 17 insertions(+), 36 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 1ae4038c..2f081521 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -5,6 +5,9 @@ import math from asyncio import Event, Queue, Semaphore + +import six + from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe @@ -110,8 +113,8 @@ def request_future(self, intermediate_key_future, options_func, create_response, status_category = PNStatusCategory.PNUnknownCategory if response is not None: - request_url = utils.urlparse(response.url) - query = utils.parse_qs(request_url.query) + request_url = six.moves.urllib.parse.urlparse(response.url) + query = six.moves.urllib.parse.parse_qs(request_url.query) uuid = None auth_key = None diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 5380cb42..df85450e 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -4,6 +4,7 @@ import time import datetime +import six import tornado.gen import tornado.httpclient import tornado.ioloop @@ -180,8 +181,8 @@ def response_callback(response): status_category = PNStatusCategory.PNUnknownCategory if response is not None: - request_url = utils.urlparse(response.effective_url) - query = utils.parse_qs(request_url.query) + request_url = six.moves.urllib.parse.urlparse(response.effective_url) + query = six.moves.urllib.parse.parse_qs(request_url.query) uuid = None auth_key = None diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index 2e434910..e969c276 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -1,6 +1,7 @@ import logging import threading import requests +import six from requests import Session from pubnub import utils @@ -94,8 +95,8 @@ def _build_envelope(self, p_options, e_options): exception=e)) if res is not None: - url = utils.urlparse(res.url) - query = utils.parse_qs(url.query) + url = six.moves.urllib.parse.urlparse(res.url) + query = six.moves.urllib.parse.parse_qs(url.query) uuid = None auth_key = None diff --git a/pubnub/request_handlers/urllib2_handler.py b/pubnub/request_handlers/urllib2_handler.py index ebb897b2..e51d3b17 100644 --- a/pubnub/request_handlers/urllib2_handler.py +++ b/pubnub/request_handlers/urllib2_handler.py @@ -3,6 +3,7 @@ import socket import threading +import six from six.moves import urllib from pubnub import utils @@ -101,8 +102,8 @@ def _build_envelope(self, p_options, e_options): exception=e)) if res is not None: - url = utils.urlparse(res.url) - query = utils.parse_qs(url.query) + url = six.moves.urllib.parse.urlparse(res.url) + query = six.moves.urllib.parse.parse_qs(url.query) uuid = None auth_key = None diff --git a/pubnub/utils.py b/pubnub/utils.py index 330fef60..f1440fe8 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -16,27 +16,6 @@ from .errors import PNERR_JSON_NOT_SERIALIZABLE from .exceptions import PubNubException -# TODO: migrate to :six: helpers instead of following -try: - from urllib.parse import urlunsplit as pn_urlunsplit -except ImportError: - from urlparse import urlunsplit as pn_urlunsplit - -try: - from urllib.parse import urlparse as pn_urlparse -except ImportError: - from urlparse import urlparse as pn_urlparse - -try: - from urllib.parse import urlencode as pn_urlencode -except ImportError: - from urllib import urlencode as pn_urlencode - -try: - from urllib.parse import parse_qs as pn_parse_qs -except ImportError: - from urlparse import parse_qs as pn_parse_qs - def get_data_for_user(data): try: @@ -98,7 +77,7 @@ def extend_list(existing_items, new_items): def build_url(scheme, origin, path, params={}): - return pn_urlunsplit((scheme, origin, path, params, '')) + return six.moves.urllib.parse.urlunsplit((scheme, origin, path, params, '')) def synchronized(func): @@ -111,7 +90,6 @@ def synced_func(*args, **kws): return synced_func -# TODO: utils lib isn't a good place for this kid of helpers def is_subscribed_event(status): assert isinstance(status, PNStatus) return status.category == PNStatusCategory.PNConnectedCategory @@ -175,6 +153,3 @@ def push_type_to_string(push_type): return "mpns" else: return "" - -urlparse = pn_urlparse -parse_qs = pn_parse_qs diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index 39fd0ddf..7bce16d1 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -51,7 +51,7 @@ def test_multiple_channels(event_loop): yield from callback.wait_for_connect() - yield from asyncio.sleep(5) + yield from asyncio.sleep(7) env = yield from pubnub.where_now() \ .uuid(uuid) \ diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py index 1d3030ca..eb0f8054 100644 --- a/tests/integrational/tornado/test_where_now.py +++ b/tests/integrational/tornado/test_where_now.py @@ -20,7 +20,7 @@ def test_single_channel(self): self.pubnub.config.uuid = uuid yield connect_to_channel(self.pubnub, ch) - yield gen.sleep(5) + yield gen.sleep(7) env = yield self.pubnub.where_now() \ .uuid(uuid) \ .future() From 6e38be7096fed033626298c27cf01c2c5e11ecda Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 4 Aug 2016 10:08:28 -0700 Subject: [PATCH 252/468] Update CHANGELOG & VERSION --- CHANGELOG | 55 ++----------------------------------------------------- VERSION | 2 +- 2 files changed, 3 insertions(+), 54 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d912c8ca..ad2a6809 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,54 +1,3 @@ +4.0.0.beta1 +- initial beta -3.7.7 - 02-10-2015 - 3012d7e -. Adding .stop() method for base python async operations to exit the listener - -3.7.6 - 02-10-2015 - 3012d7e -. fixed issues in receiving gzipped response for twisted -. fix for non reporting of dns lookup failure -. fix in time method - -3.7.5 - 12-08-2015 - 61f1adc -. increased timeout to 15 sec - -3.7.4 - 11-17-15 - 8a00782 -. added state and here_now -. added presence heartbeat support - -3.7.2 - 6-25-15 - ad89de8 -. fix for decryption bug in history API -. module name changed to pubnub ( it was Pubnub earlier ). - Developers need to do from pubnub import Pubnub, instead of from Pubnub import Pubnub now -. fixed method arguments bug for presence API -. subscribe_sync removed -. fix for issue where error callback not invoked for presence -. added state support in subscribe and here now -. fix for grant API with python 3 -. added include_token option to history - -3.7.0 - 1-12-14 - f20e5e2 -. Channel Groups functionality -. Added Python Echo Server example -. Added missing timeout keyword arg -. Bringing versioning up to standard (3.7) - -3.5.3 - 10-21-14 - dc617ed -. Added patch to handle quick net calls in Azure environments -. Presence fixes -. added daemon flag - -3.5.2 - 6-25-14 - 1f98c4 -. Added pnsdk URL param to each request -. Added grant/revoke/audit examples to README -. Fixed erroneous "Connected" error condition in console -. Can now pass init vars via the CL on console -. Fixed UI issue of bracket color on console -. Enable subscribing to "-pnpres" channel on console - -3.5.1 - 6-17-14 -. Added subscribe_sync method -. renamed pres_uuid argument for Pubnub constructor to uuid - -3.5.0 - 6-16-14 -New version! Complete re-write! -. Async subscribe allows for MX, unsubscribe calls -. New method signatures -- be sure to check migration doc if upgrading diff --git a/VERSION b/VERSION index d2577d97..14e1b442 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.7.7 +4.0.0.beta1 From a5c236b0863ef76e4c9b16cfa94d0cdf812e3daa Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 4 Aug 2016 03:57:24 -0700 Subject: [PATCH 253/468] working on vcr... --- tests/helper.py | 20 ++++++++++++++++++- .../publish/publish_string_get.yaml | 4 ++-- tests/integrational/tornado/test_publish.py | 14 +++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/tests/helper.py b/tests/helper.py index a67cbd13..ba8a0a3a 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -7,6 +7,10 @@ import vcr from copy import copy + +from vcr.cassette import Cassette + +import pubnub.pubnub_tornado from pubnub import utils from pubnub.pnconfiguration import PNConfiguration @@ -97,8 +101,22 @@ def gen_string(l): return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(l)) +from vcr.stubs.tornado_stubs import vcr_fetch_impl + + +_SimpleAsyncHTTPClient_fetch_impl = pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient.fetch_impl + +cassette = Cassette("") +new_fetch_impl = vcr_fetch_impl( + cassette, _SimpleAsyncHTTPClient_fetch_impl + # self._cassette, _SimpleAsyncHTTPClient_fetch_impl +) + pn_vcr = vcr.VCR( - cassette_library_dir=os.path.dirname((os.path.dirname(os.path.abspath(__file__)))) + cassette_library_dir=os.path.dirname((os.path.dirname(os.path.abspath(__file__)))), + custom_patches=((pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient, + 'fetch_impl', new_fetch_impl),) + # custom_patches=((pubnub.pubnub_tornado, 'PubNubTornadoSimpleAsyncHTTPClient', VCRHTTPConnection),) ) diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index 91cfe42c..aab0c736 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -9,7 +9,7 @@ interactions: method: GET uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 response: - body: {string: '[1,"Sent","14691119123769397"]'} + body: {string: '[1,"Sent","14703077680843249"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:38:32 GMT'] + Date: ['Thu, 04 Aug 2016 10:49:28 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 9c72eb8b..b152254c 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -9,7 +9,7 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope, PubNubTornadoException -from tests.helper import pnconf, pnconf_enc +from tests.helper import pnconf, pnconf_enc, pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) @@ -80,12 +80,14 @@ def assert_client_side_error(self, pub, expected_err_msg): self.pubnub.stop() self.stop() - def test_publish_string_via_get(self): + @pn_vcr.use_cassette('tests/integrational/fixtures/tornado/publish/publish_get.yaml', + filter_query_parameters=['uuid']) + def test_publish_string_via_getx(self): self.assert_success_publish_get("hi") - self.assert_success_publish_get(5) - self.assert_success_publish_get(True) - self.assert_success_publish_get(["hi", "hi2", "hi3"]) - self.assert_success_publish_get({"name": "Alex", "online": True}) + # self.assert_success_publish_get(5) + # self.assert_success_publish_get(True) + # self.assert_success_publish_get(["hi", "hi2", "hi3"]) + # self.assert_success_publish_get({"name": "Alex", "online": True}) def test_publish_string_via_post(self): self.assert_success_publish_post("hi") From 588d89e04348d22005f9d04f919ca412ba3ef73f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 8 Aug 2016 22:06:56 -0700 Subject: [PATCH 254/468] Add Tornado fixtures --- pubnub/pubnub_tornado.py | 4 +- .../tornado/publish/mixed_via_get.yaml | 266 ++++++++++++++++++ .../publish/mixed_via_get_encrypted.yaml | 266 ++++++++++++++++++ .../tornado/publish/mixed_via_post.yaml | 266 ++++++++++++++++++ .../publish/mixed_via_post_encrypted.yaml | 266 ++++++++++++++++++ .../tornado/publish/object_via_get.yaml | 68 +++++ .../publish/object_via_get_encrypted.yaml | 68 +++++ .../tornado/publish/object_via_post.yaml | 68 +++++ .../publish/object_via_post_encrypted.yaml | 68 +++++ tests/integrational/tornado/test_publish.py | 65 ++++- 10 files changed, 1392 insertions(+), 13 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/object_via_get.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/object_via_post.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index df85450e..319149a0 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -56,7 +56,8 @@ def after_key_callback(callback): "%d active, %d queued requests." % ( len(self.active), len(self.queue))) - self.io_loop.add_callback(initial_callback, _TornadoKeyResponse(key, after_key_callback)) + key_response = _TornadoKeyResponse(key, after_key_callback) + self.io_loop.add_callback(initial_callback, key_response) class _TornadoKeyResponse(object): @@ -225,6 +226,7 @@ def response_callback(response): if response.error is not None: if response.code >= 500: err = PNERR_SERVER_ERROR + data = str(response.error) else: err = PNERR_CLIENT_ERROR diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml new file mode 100644 index 00000000..4f5baff9 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -0,0 +1,266 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654961878754"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654962988338"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654963998910"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654965094211"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654966264107"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654968497326"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654969624146"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:36 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654971058947"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml new file mode 100644 index 00000000..4af74baf --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -0,0 +1,266 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654973576283"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654974534808"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654975469383"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654976370725"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654977343057"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654978302189"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654979370691"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:37 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706654980293520"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:11:38 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml new file mode 100644 index 00000000..143a5c9a --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -0,0 +1,266 @@ +interactions: +- request: + body: '"hi"' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789261217101"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"hi"' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789261901583"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '5' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789262581697"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '5' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789263258448"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: 'true' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789263937508"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: 'true' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789264623948"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '["hi", "hi2", "hi3"]' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789265622885"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '["hi", "hi2", "hi3"]' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706789266306131"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:55:26 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml new file mode 100644 index 00000000..58a5bba3 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -0,0 +1,266 @@ +interactions: +- request: + body: '"Dt7qBesIhJT2DweUJc2HRQ=="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724320847330"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"Dt7qBesIhJT2DweUJc2HRQ=="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724321905127"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724322939251"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724323960752"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"jw/KAwQAoKtQfHyYrROqSQ=="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724325062358"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"jw/KAwQAoKtQfHyYrROqSQ=="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724326150829"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724327259504"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706724328343318"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 16:07:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml new file mode 100644 index 00000000..2924352b --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706653397219269"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:08:59 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706653398506519"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:08:59 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml new file mode 100644 index 00000000..4cf48bc1 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706653400646308"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:09:00 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706653401928744"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 14:09:00 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml new file mode 100644 index 00000000..549532ba --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: '{"online": true, "name": "Alex"}' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706787329216107"]'} + headers: + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:52:12 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff +- request: + body: '{"online": true, "name": "Alex"}' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706787330184998"]'} + headers: + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:52:13 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml new file mode 100644 index 00000000..139ec069 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706781595277610"]'} + headers: + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:42:39 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.0&seqn=1 +- request: + body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14706781596540558"]'} + headers: + - !!python/tuple + - Date + - ['Mon, 08 Aug 2016 17:42:39 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.0&seqn=2 +version: 1 diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index b152254c..3a9b01dc 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -9,11 +9,12 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope, PubNubTornadoException -from tests.helper import pnconf, pnconf_enc, pn_vcr +from tests.helper import pnconf, pnconf_enc, gen_decrypt_func +from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) -ch = "tornado-int-publish" +ch = "tornado-publish" class TestPubNubAsyncPublish(AsyncTestCase): @@ -80,34 +81,74 @@ def assert_client_side_error(self, pub, expected_err_msg): self.pubnub.stop() self.stop() - @pn_vcr.use_cassette('tests/integrational/fixtures/tornado/publish/publish_get.yaml', - filter_query_parameters=['uuid']) - def test_publish_string_via_getx(self): + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_publish_mixed_via_get(self): self.assert_success_publish_get("hi") - # self.assert_success_publish_get(5) - # self.assert_success_publish_get(True) - # self.assert_success_publish_get(["hi", "hi2", "hi3"]) - # self.assert_success_publish_get({"name": "Alex", "online": True}) - + self.assert_success_publish_get(5) + self.assert_success_publish_get(True) + self.assert_success_publish_get(["hi", "hi2", "hi3"]) + + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/object_via_get.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['object_in_path']) + def test_publish_object_via_get(self): + self.assert_success_publish_get({"name": "Alex", "online": True}) + + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'body']) def test_publish_string_via_post(self): self.assert_success_publish_post("hi") self.assert_success_publish_post(5) self.assert_success_publish_post(True) self.assert_success_publish_post(["hi", "hi2", "hi3"]) + + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/object_via_post.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'object_in_body']) + def test_publish_object_via_post(self): self.assert_success_publish_post({"name": "Alex", "online": True}) - def test_publish_string_via_get_encrypted(self): + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_publish_mixed_via_get_encrypted(self): self.assert_success_publish_get_encrypted("hi") self.assert_success_publish_get_encrypted(5) self.assert_success_publish_get_encrypted(True) self.assert_success_publish_get_encrypted(["hi", "hi2", "hi3"]) + + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['object_in_path'], + match_on_kwargs={'object_in_path': { + 'decrypter': gen_decrypt_func('testKey')}}) + def test_publish_object_via_get_encrypted(self): self.assert_success_publish_get_encrypted({"name": "Alex", "online": True}) - def test_publish_string_via_post_encrypted(self): + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'body']) + def test_publish_mixed_via_post_encrypted(self): self.assert_success_publish_post_encrypted("hi") self.assert_success_publish_post_encrypted(5) self.assert_success_publish_post_encrypted(True) self.assert_success_publish_post_encrypted(["hi", "hi2", "hi3"]) + + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'object_in_body'], + match_on_kwargs={'object_in_body': { + 'decrypter': gen_decrypt_func('testKey')}}) + def test_publish_object_via_post_encrypted(self): self.assert_success_publish_post_encrypted({"name": "Alex", "online": True}) def test_error_missing_message(self): From f7850236a7df120c9a8a27f3c11c1b261c67825b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 8 Aug 2016 22:26:43 -0700 Subject: [PATCH 255/468] Add crypto unit test --- tests/unit/test_crypto.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/unit/test_crypto.py b/tests/unit/test_crypto.py index 270030f1..f77101cc 100644 --- a/tests/unit/test_crypto.py +++ b/tests/unit/test_crypto.py @@ -1,6 +1,8 @@ +import json import unittest from pubnub import crypto +from tests.helper import gen_decrypt_func todecode = 'QfD1NCBJCmt1aPPGU2cshw==' key = 'testKey' @@ -18,3 +20,9 @@ def test_decode_aes(self): assert crypto.decrypt(key, crypto.encrypt(key, hey)) == hey assert crypto.decrypt(key, todecode) == "hey-0" + + def test_vc_body_decoder(self): + input = b'"9P/7+NNs54o7Go41yh+3rIn8BW0H0ad+mKlKTKGw2i1eoQP1ddHrnIzkRUPEC3ko"' + # print(json.loads(input.decode('utf-8'))) + assert {"name": "Alex", "online": True} == \ + gen_decrypt_func('testKey')(input.decode('utf-8')) From 5ab605074d702ae862a60094c4b4856aa5dd7b72 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 8 Aug 2016 22:28:16 -0700 Subject: [PATCH 256/468] Move vcr helper to the different file --- tests/helper.py | 137 ++------------------------- tests/integrational/vcr_helper.py | 151 ++++++++++++++++++++++++++++++ 2 files changed, 157 insertions(+), 131 deletions(-) create mode 100644 tests/integrational/vcr_helper.py diff --git a/tests/helper.py b/tests/helper.py index ba8a0a3a..78a5c597 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -1,16 +1,10 @@ -import json -import os import threading import string import random import six -import vcr +import pubnub.crypto as pn_crypto from copy import copy - -from vcr.cassette import Cassette - -import pubnub.pubnub_tornado from pubnub import utils from pubnub.pnconfiguration import PNConfiguration @@ -101,131 +95,12 @@ def gen_string(l): return ''.join(random.choice(string.ascii_uppercase + string.digits) for _ in range(l)) -from vcr.stubs.tornado_stubs import vcr_fetch_impl - - -_SimpleAsyncHTTPClient_fetch_impl = pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient.fetch_impl - -cassette = Cassette("") -new_fetch_impl = vcr_fetch_impl( - cassette, _SimpleAsyncHTTPClient_fetch_impl - # self._cassette, _SimpleAsyncHTTPClient_fetch_impl -) - -pn_vcr = vcr.VCR( - cassette_library_dir=os.path.dirname((os.path.dirname(os.path.abspath(__file__)))), - custom_patches=((pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient, - 'fetch_impl', new_fetch_impl),) - # custom_patches=((pubnub.pubnub_tornado, 'PubNubTornadoSimpleAsyncHTTPClient', VCRHTTPConnection),) -) - - -def meta_object_in_query_matcher(r1, r2): - return assert_request_equal_with_object_in_query(r1, r2, 'meta') - - -def state_object_in_query_matcher(r1, r2): - return assert_request_equal_with_object_in_query(r1, r2, 'state') - - -def assert_request_equal_with_object_in_query(r1, r2, query_field_name): - try: - assert r1.body == r2.body - assert r1.headers == r2.headers - assert r1.host == r2.host - assert r1.method == r2.method - assert r1.path == r2.path - assert r1.port == r2.port - assert r1.protocol == r2.protocol - assert r1.scheme == r2.scheme - - for v in r1.query: - if v[0] == query_field_name: - for w in r2.query: - if w[0] == query_field_name: - assert json.loads(v[1]) == json.loads(w[1]) - else: - for w in r2.query: - if w[0] == v[0]: - assert w[1] == v[1] - - except AssertionError: - return False - - return True - - -def publish_object_matcher(r1, r2): - try: - assert r1.body == r2.body - assert r1.headers == r2.headers - assert r1.host == r2.host - assert r1.method == r2.method - assert r1.query == r2.query - assert r1.port == r2.port - assert r1.protocol == r2.protocol - assert r1.scheme == r2.scheme - - path1 = r1.path.split('/') - path2 = r2.path.split('/') - - for k, v in enumerate(path1): - if k == (len(path1) - 1): - assert json.loads(url_decode(v)) == json.loads(url_decode(path2[k])) - else: - assert v == path2[k] - - except AssertionError: - return False - - return True - - -def check_the_difference_matcher(r1, r2): - """ A helper to check the difference between two requests """ - - try: - assert r1.body == r2.body - assert r1.headers == r2.headers - assert r1.host == r2.host - assert r1.method == r2.method - assert r1.query == r2.query - assert r1.port == r2.port - assert r1.protocol == r2.protocol - assert r1.scheme == r2.scheme - assert r1.path == r2.path - except AssertionError: - return False - - return True - +def gen_decrypt_func(cipher_key): + def decrypter(entry): + mr = pn_crypto.decrypt(cipher_key, entry) + return mr -pn_vcr.register_matcher('meta_object_in_query', meta_object_in_query_matcher) -pn_vcr.register_matcher('state_object_in_query', state_object_in_query_matcher) -pn_vcr.register_matcher('publish_object', publish_object_matcher) -pn_vcr.register_matcher('check_the_difference', check_the_difference_matcher) - - -def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): - context = pn_vcr.use_cassette(cassette_name, filter_query_parameters=filter_query_parameters) - cs = context.cls(path=cassette_name).load(path=cassette_name) - - def _inner(f): - @patch('time.sleep', return_value=None) - @six.wraps(f) - def stubbed(*args): - with context as cassette: - largs = list(args) - largs.pop(1) - return f(*largs) - - @six.wraps(f) - def original(*args): - with context as cassette: - return f(*args) - - return stubbed if len(cs) > 0 else original - return _inner + return decrypter class CountDownLatch(object): diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py new file mode 100644 index 00000000..148a78f4 --- /dev/null +++ b/tests/integrational/vcr_helper.py @@ -0,0 +1,151 @@ +import json +import os +from unittest.mock import patch + +import six +import vcr +from vcr.stubs.pubnub_tornado_stubs import vcr_fetch_impl + +import pubnub.pubnub_tornado +from tests.helper import url_decode + +_SimpleAsyncHTTPClient_fetch_impl = pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient.fetch_impl + + +class PatchWrapper(object): + def wrap_cassette(self, cassette): + return vcr_fetch_impl( + cassette, _SimpleAsyncHTTPClient_fetch_impl + ) + + +pn_vcr = vcr.VCR( + cassette_library_dir=os.path.dirname(os.path.dirname((os.path.dirname(os.path.abspath(__file__))))), + custom_patches=((pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient, + 'fetch_impl', PatchWrapper()),) +) + + +def meta_object_in_query_matcher(r1, r2): + return assert_request_equal_with_object_in_query(r1, r2, 'meta') + + +def state_object_in_query_matcher(r1, r2): + return assert_request_equal_with_object_in_query(r1, r2, 'state') + + +def assert_request_equal_with_object_in_query(r1, r2, query_field_name): + try: + assert r1.body == r2.body + assert r1.headers == r2.headers + assert r1.host == r2.host + assert r1.method == r2.method + assert r1.path == r2.path + assert r1.port == r2.port + assert r1.protocol == r2.protocol + assert r1.scheme == r2.scheme + + for v in r1.query: + if v[0] == query_field_name: + for w in r2.query: + if w[0] == query_field_name: + assert json.loads(v[1]) == json.loads(w[1]) + else: + for w in r2.query: + if w[0] == v[0]: + assert w[1] == v[1] + + except AssertionError: + return False + + return True + + +def object_in_path_matcher(r1, r2, decrypter=None): + try: + assert r1.body == r2.body + assert r1.headers == r2.headers + assert r1.host == r2.host + assert r1.method == r2.method + assert r1.query == r2.query + assert r1.port == r2.port + assert r1.protocol == r2.protocol + assert r1.scheme == r2.scheme + + path1 = r1.path.split('/') + path2 = r2.path.split('/') + + for k, v in enumerate(path1): + if k == (len(path1) - 1): + if decrypter is not None: + assert decrypter(url_decode(v)) == decrypter(url_decode(path2[k])) + else: + assert json.loads(url_decode(v)) == json.loads(url_decode(path2[k])) + else: + assert v == path2[k] + + except AssertionError as e: + return False + + return True + + +def object_in_body_matcher(r1, r2, decrypter=None): + try: + if decrypter is not None: + assert decrypter(r1.body.decode('utf-8')) == decrypter(r2.body.decode('utf-8')) + else: + assert json.loads(url_decode(r1.body.decode('utf-8'))) == json.loads(url_decode(r2.body.decode('utf-8'))) + + except AssertionError as e: + return False + + return True + + +def check_the_difference_matcher(r1, r2): + """ A helper to check the difference between two requests """ + + try: + assert r1.body == r2.body + assert r1.headers == r2.headers + assert r1.host == r2.host + assert r1.method == r2.method + assert r1.query == r2.query + assert r1.port == r2.port + assert r1.protocol == r2.protocol + assert r1.scheme == r2.scheme + assert r1.path == r2.path + except AssertionError: + return False + + return True + + +pn_vcr.register_matcher('meta_object_in_query', meta_object_in_query_matcher) +pn_vcr.register_matcher('state_object_in_query', state_object_in_query_matcher) +pn_vcr.register_matcher('object_in_path', object_in_path_matcher) +pn_vcr.register_matcher('object_in_body', object_in_body_matcher) +pn_vcr.register_matcher('check_the_difference', check_the_difference_matcher) + + +def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): + context = pn_vcr.use_cassette(cassette_name, filter_query_parameters=filter_query_parameters) + cs = context.cls(path=cassette_name).load(path=cassette_name) + + def _inner(f): + @patch('time.sleep', return_value=None) + @six.wraps(f) + def stubbed(*args): + with context as cassette: + largs = list(args) + largs.pop(1) + return f(*largs) + + @six.wraps(f) + def original(*args): + with context as cassette: + return f(*args) + + return stubbed if len(cs) > 0 else original + return _inner From f62524ba48e13a9763c17827386d4b12e6e69862 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 8 Aug 2016 23:28:30 -0700 Subject: [PATCH 257/468] Add Tornado publish cassettes --- .../tornado/publish/do_not_store.yaml | 68 +++++++++++++++++++ .../fixtures/tornado/publish/invalid_key.yaml | 68 +++++++++++++++++++ .../fixtures/tornado/publish/meta_object.yaml | 68 +++++++++++++++++++ tests/integrational/tornado/test_publish.py | 18 +++-- tests/integrational/vcr_helper.py | 9 --- 5 files changed, 218 insertions(+), 13 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/publish/do_not_store.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/invalid_key.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/meta_object.yaml diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml new file mode 100644 index 00000000..28f597db --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0&store=0 + response: + body: {string: '[1,"Sent","14707213568554057"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Tue, 09 Aug 2016 05:42:36 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0&store=0 + response: + body: {string: '[1,"Sent","14707213569308777"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Tue, 09 Aug 2016 05:42:36 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml new file mode 100644 index 00000000..ba99c8e0 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[0,"Invalid Key","14707240653092162"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['37'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Tue, 09 Aug 2016 06:27:45 GMT'] + status: {code: 400, message: INVALID} + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[0,"Invalid Key","14707240653816927"]'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['37'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Tue, 09 Aug 2016 06:27:45 GMT'] + status: {code: 400, message: INVALID} + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml new file mode 100644 index 00000000..51ae15a6 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -0,0 +1,68 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14707233493629583"]'} + headers: + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Tue, 09 Aug 2016 06:15:49 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14707233494525529"]'} + headers: + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Tue, 09 Aug 2016 06:15:49 GMT'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['30'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 3a9b01dc..c2473a96 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -93,14 +93,14 @@ def test_publish_mixed_via_get(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_get.yaml', filter_query_parameters=['uuid', 'seqn'], - match_on=['object_in_path']) + match_on=['host', 'method', 'query', 'object_in_path']) def test_publish_object_via_get(self): self.assert_success_publish_get({"name": "Alex", "online": True}) @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml', filter_query_parameters=['uuid', 'seqn'], - match_on=['method', 'path', 'query', 'body']) + match_on=['host', 'method', 'path', 'query', 'body']) def test_publish_string_via_post(self): self.assert_success_publish_post("hi") self.assert_success_publish_post(5) @@ -110,7 +110,7 @@ def test_publish_string_via_post(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_post.yaml', filter_query_parameters=['uuid', 'seqn'], - match_on=['method', 'path', 'query', 'object_in_body']) + match_on=['host', 'method', 'path', 'query', 'object_in_body']) def test_publish_object_via_post(self): self.assert_success_publish_post({"name": "Alex", "online": True}) @@ -126,7 +126,7 @@ def test_publish_mixed_via_get_encrypted(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml', filter_query_parameters=['uuid', 'seqn'], - match_on=['object_in_path'], + match_on=['host', 'method', 'query', 'object_in_path'], match_on_kwargs={'object_in_path': { 'decrypter': gen_decrypt_func('testKey')}}) def test_publish_object_via_get_encrypted(self): @@ -200,6 +200,9 @@ def assert_server_side_error_yield(self, pub, expected_err_msg): self.pubnub.stop() self.stop() + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/invalid_key.yaml', + filter_query_parameters=['uuid', 'seqn']) def test_error_invalid_key(self): conf = PNConfiguration() conf.publish_key = "fake" @@ -210,6 +213,10 @@ def test_error_invalid_key(self): self.assert_server_side_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") self.assert_server_side_error_yield(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/meta_object.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['host', 'method', 'path', 'meta_object_in_query']) def test_publish_with_meta(self): self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) @@ -218,6 +225,9 @@ def test_publish_with_meta(self): self.assert_success_yield( self.pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/do_not_store.yaml', + filter_query_parameters=['uuid', 'seqn']) def test_publish_do_not_store(self): self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index 148a78f4..a78be54a 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -63,15 +63,6 @@ def assert_request_equal_with_object_in_query(r1, r2, query_field_name): def object_in_path_matcher(r1, r2, decrypter=None): try: - assert r1.body == r2.body - assert r1.headers == r2.headers - assert r1.host == r2.host - assert r1.method == r2.method - assert r1.query == r2.query - assert r1.port == r2.port - assert r1.protocol == r2.protocol - assert r1.scheme == r2.scheme - path1 = r1.path.split('/') path2 = r2.path.split('/') From 97a917707ba6ed89642d6fc6b2e6178b0a1a963a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 10 Aug 2016 00:01:19 -0700 Subject: [PATCH 258/468] Add tornado CG cassettes --- .../groups/add_channel_remove_group.yaml | 175 ++++++++++++++++++ .../groups/add_remove_multiple_channel.yaml | 175 ++++++++++++++++++ .../groups/add_remove_single_channel.yaml | 175 ++++++++++++++++++ .../native_sync/test_channel_groups.py | 4 +- .../tornado/test_channel_groups.py | 24 ++- tests/integrational/vcr_helper.py | 10 + 6 files changed, 554 insertions(+), 9 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml create mode 100644 tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml create mode 100644 tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml new file mode 100644 index 00000000..5cbda7e5 --- /dev/null +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -0,0 +1,175 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:00 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], + "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": + false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:02 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['156'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:02 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, + "service": "channel-registry", "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:03 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['129'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml new file mode 100644 index 00000000..4ba778a8 --- /dev/null +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -0,0 +1,175 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:03 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", + "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": + "channel-registry", "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:04 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['187'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:04 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, + "service": "channel-registry", "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:05 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['129'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml new file mode 100644 index 00000000..50fad114 --- /dev/null +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -0,0 +1,175 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:05 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], + "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": + false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:06 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['156'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=channel-groups-tornado-ch + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:06 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, + "service": "channel-registry", "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 06:58:07 GMT'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['129'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 47c74f52..b08ec1c1 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -15,8 +15,8 @@ class TestPubNubChannelGroups(unittest.TestCase): @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', filter_query_parameters=['uuid']) def test_single_channel(self): - ch = "channel-groups-unit-ch" - gr = "channel-groups-unit-cg" + ch = "channel-groups-native-ch" + gr = "channel-groups-native-cg" pubnub = PubNub(pnconf_copy()) # add diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py index 3c97e2b8..0a90e7f1 100644 --- a/tests/integrational/tornado/test_channel_groups.py +++ b/tests/integrational/tornado/test_channel_groups.py @@ -7,6 +7,7 @@ from pubnub.pubnub_tornado import PubNubTornado from tests import helper from tests.helper import pnconf +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep class TestChannelGroups(AsyncTestCase): @@ -14,10 +15,13 @@ def setUp(self): super(TestChannelGroups, self).setUp() self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test def test_add_remove_single_channel(self): - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "channel-groups-tornado-ch" + gr = "channel-groups-tornado-cg" # add env = yield self.pubnub.add_channel_to_channel_group() \ @@ -49,11 +53,14 @@ def test_add_remove_single_channel(self): self.pubnub.stop() self.stop() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test def test_add_remove_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch1 = "channel-groups-tornado-ch1" + ch2 = "channel-groups-tornado-ch2" + gr = "channel-groups-tornado-cg" # add env = yield self.pubnub.add_channel_to_channel_group() \ @@ -86,10 +93,13 @@ def test_add_remove_multiple_channels(self): self.pubnub.stop() self.stop() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test def test_add_channel_remove_group(self): - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "channel-groups-tornado-ch" + gr = "channel-groups-tornado-cg" # add env = yield self.pubnub.add_channel_to_channel_group() \ diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index a78be54a..05b840e4 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -124,13 +124,23 @@ def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): context = pn_vcr.use_cassette(cassette_name, filter_query_parameters=filter_query_parameters) cs = context.cls(path=cassette_name).load(path=cassette_name) + import tornado.gen + + @tornado.gen.coroutine + def returner(): + return + def _inner(f): @patch('time.sleep', return_value=None) + @patch('tornado.gen.sleep', return_value=returner()) + @patch('asyncio.sleep', return_value=returner()) @six.wraps(f) def stubbed(*args): with context as cassette: largs = list(args) largs.pop(1) + largs.pop(1) + largs.pop(1) return f(*largs) @six.wraps(f) From 6168e8924e160bf89403c717e84101ebbc6f8bcf Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 10 Aug 2016 00:41:04 -0700 Subject: [PATCH 259/468] Add Tornado State cassettes --- .../tornado/state/multiple_channel.yaml | 89 +++++++++++++++++++ .../tornado/state/single_channel.yaml | 88 ++++++++++++++++++ .../tornado/test_channel_groups.py | 1 - tests/integrational/tornado/test_state.py | 23 +++-- tests/integrational/vcr_helper.py | 13 +-- 5 files changed, 196 insertions(+), 18 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/state/multiple_channel.yaml create mode 100644 tests/integrational/fixtures/tornado/state/single_channel.yaml diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml new file mode 100644 index 00000000..f7581633 --- /dev/null +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -0,0 +1,89 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['96'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 07:39:00 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": + {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, + "service": "Presence", "uuid": "state-tornado-uuid"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['214'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 07:39:01 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=state-tornado-uuid +version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml new file mode 100644 index 00000000..4fc8147c --- /dev/null +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -0,0 +1,88 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 07:32:02 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Length + - ['96'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", + "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 07:32:02 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Length + - ['157'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Connection + - [close] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=state-tornado-uuid +version: 1 diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py index 0a90e7f1..57842e5f 100644 --- a/tests/integrational/tornado/test_channel_groups.py +++ b/tests/integrational/tornado/test_channel_groups.py @@ -5,7 +5,6 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub_tornado import PubNubTornado -from tests import helper from tests.helper import pnconf from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index c06139df..f922572b 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -2,20 +2,26 @@ from tornado.testing import AsyncHTTPTestCase, AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado from tests import helper -from tests.helper import pnconf +from tests.helper import pnconf_copy # TODO: test for 'No valid channels specified' # TODO: test for CG state getter (after implementation of CG methods) +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep class TestPubNubState(AsyncTestCase): def setUp(self): super(TestPubNubState, self).setUp() - self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + self.pubnub = PubNubTornado(pnconf_copy(), custom_ioloop=self.io_loop) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/state/single_channel.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @tornado.testing.gen_test - def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") + def test_test_single_channel(self): + ch = "state-tornado-ch" + self.pubnub.config.uuid = 'state-tornado-uuid' state = {"name": "Alex", "count": 5} env = yield self.pubnub.set_state() \ @@ -36,10 +42,15 @@ def test_single_channel(self): self.pubnub.stop() self.stop() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/state/multiple_channel.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @tornado.testing.gen_test def test_multiple_channels(self): - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") + ch1 = "state-tornado-ch1" + ch2 = "state-tornado-ch2" + self.pubnub.config.uuid = 'state-tornado-uuid' state = {"name": "Alex", "count": 5} env = yield self.pubnub.set_state() \ diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index 05b840e4..c4bc5bfd 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -36,15 +36,6 @@ def state_object_in_query_matcher(r1, r2): def assert_request_equal_with_object_in_query(r1, r2, query_field_name): try: - assert r1.body == r2.body - assert r1.headers == r2.headers - assert r1.host == r2.host - assert r1.method == r2.method - assert r1.path == r2.path - assert r1.port == r2.port - assert r1.protocol == r2.protocol - assert r1.scheme == r2.scheme - for v in r1.query: if v[0] == query_field_name: for w in r2.query: @@ -120,8 +111,8 @@ def check_the_difference_matcher(r1, r2): pn_vcr.register_matcher('check_the_difference', check_the_difference_matcher) -def use_cassette_and_stub_time_sleep(cassette_name, filter_query_parameters): - context = pn_vcr.use_cassette(cassette_name, filter_query_parameters=filter_query_parameters) +def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): + context = pn_vcr.use_cassette(cassette_name, **kwargs) cs = context.cls(path=cassette_name).load(path=cassette_name) import tornado.gen From 68a16eeab687863041a2396281ef2c4f5cb513ee Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 10 Aug 2016 05:07:52 -0700 Subject: [PATCH 260/468] Add tornado sub/unsub cassette --- .../fixtures/tornado/subscribe/sub_unsub.yaml | 78 +++++++++++++++++++ tests/integrational/tornado/test_state.py | 3 +- tests/integrational/tornado/test_subscribe.py | 11 ++- 3 files changed, 88 insertions(+), 4 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml new file mode 100644 index 00000000..580dbb5d --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -0,0 +1,78 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708258632518858","r":12},"m":[]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 10:44:23 GMT'] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?uuid=c7f5f961-f136-498c-a50a-a664b7b49850&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 10:44:23 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Cache-Control + - [no-cache] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?uuid=c7f5f961-f136-498c-a50a-a664b7b49850&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index f922572b..382a3714 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -1,7 +1,6 @@ import tornado from tornado.testing import AsyncHTTPTestCase, AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado -from tests import helper from tests.helper import pnconf_copy # TODO: test for 'No valid channels specified' @@ -19,7 +18,7 @@ def setUp(self): filter_query_parameters=['uuid', 'seqn'], match_on=['method', 'host', 'path', 'state_object_in_query']) @tornado.testing.gen_test - def test_test_single_channel(self): + def test_state_single_channel(self): ch = "state-tornado-ch" self.pubnub.config.uuid = 'state-tornado-uuid' state = {"name": "Alex", "count": 5} diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 28035a3a..5d7e4a51 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -7,6 +7,7 @@ from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests import helper from tests.helper import pnconf_sub_copy +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep pn.set_stream_logger('pubnub', logging.DEBUG) @@ -24,9 +25,12 @@ def setUp(self): self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - @tornado.testing.gen_test() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml', + filter_query_parameters=['uuid', 'seqn']) + @tornado.testing.gen_test(timeout=300) def test_subscribe_unsubscribe(self): - ch = helper.gen_channel("subscribe-test") + ch = "where-now-tornado-ch" callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) @@ -39,6 +43,9 @@ def test_subscribe_unsubscribe(self): self.pubnub.stop() self.stop() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=30) def test_subscribe_publish_unsubscribe(self): ch = helper.gen_channel("subscribe-test") From b5b0703f261a231412c72f42250ed61bca07a0fd Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 10 Aug 2016 05:38:30 -0700 Subject: [PATCH 261/468] Update tornado Subscribe cassettes --- .../tornado/subscribe/sub_pub_unsub.yaml | 144 ++++++++++++++++++ .../fixtures/tornado/subscribe/sub_unsub.yaml | 64 ++++---- tests/integrational/tornado/test_subscribe.py | 4 +- 3 files changed, 178 insertions(+), 34 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml new file mode 100644 index 00000000..adc6be5f --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -0,0 +1,144 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708323099136684","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14708323101133727"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708323099136684 + response: + body: {string: '{"t":{"t":"14708323101140128","r":3},"m":[{"a":"2","f":0,"i":"970e123c-d9a0-45b8-b885-3dae1011bf03","s":1,"p":{"t":"14708323101133727","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['230'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708323099136684&tr=3 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index 580dbb5d..6b395941 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -5,74 +5,74 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 response: - body: {string: '{"t":{"t":"14708258632518858","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14708323101261227","r":12},"m":[]}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 10:44:23 GMT'] - - !!python/tuple - - Content-Length - - ['45'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - Connection - [close] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Length + - ['45'] - !!python/tuple - Cache-Control - [no-cache] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 12:36:27 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?uuid=c7f5f961-f136-498c-a50a-a664b7b49850&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: - - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 10:44:23 GMT'] - - !!python/tuple - - Accept-Ranges - - [bytes] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Server - - [Pubnub Presence] - !!python/tuple - Connection - [close] - !!python/tuple - - Content-Length - - ['74'] + - Accept-Ranges + - [bytes] - !!python/tuple - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] - !!python/tuple - - Age - - ['0'] + - Content-Length + - ['74'] - !!python/tuple - Cache-Control - [no-cache] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 12:36:27 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?uuid=c7f5f961-f136-498c-a50a-a664b7b49850&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.0 version: 1 diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 5d7e4a51..65840894 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -30,7 +30,7 @@ def setUp(self): filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=300) def test_subscribe_unsubscribe(self): - ch = "where-now-tornado-ch" + ch = "subscribe-tornado-ch" callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) @@ -48,7 +48,7 @@ def test_subscribe_unsubscribe(self): filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=30) def test_subscribe_publish_unsubscribe(self): - ch = helper.gen_channel("subscribe-test") + ch = "subscribe-tornado-ch" message = "hey" callback_messages = SubscribeListener() From cc0861c2cb84d82f7d7577b7862e8782c5f41282 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 10 Aug 2016 08:52:57 -0700 Subject: [PATCH 262/468] Add tornado subscribe cassettes --- .../tornado/subscribe/join_leave.yaml | 294 ++++++++++++++++++ tests/integrational/tornado/test_subscribe.py | 11 +- 2 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/subscribe/join_leave.yaml diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml new file mode 100644 index 00000000..e0cb6054 --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -0,0 +1,294 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708438179383195","r":12},"m":[]}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:48 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&uuid=subscribe-tornado-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708438179383195 + response: + body: {string: '{"t":{"t":"14708443090824007","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443089669538","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1470844308, "uuid": "subscribe-tornado-listener", "occupancy": + 1},"b":"subscribe-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['315'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:49 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708443090868294","r":12},"m":[]}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:49 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&uuid=subscribe-tornado-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443090824007 + response: + body: {string: '{"t":{"t":"14708443098649253","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443097146633","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1470844309, "uuid": "subscribe-tornado-messenger", "occupancy": + 2},"b":"subscribe-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['316'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:49 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443098649253 + response: + body: {string: '{"t":{"t":"14708443101375638","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443100579978","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-messenger", "occupancy": + 1},"b":"subscribe-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['317'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:50 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:50 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=subscribe-tornado-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443101375638 + response: + body: {string: '{"t":{"t":"14708443105516188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443104721390","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-listener", "occupancy": + 0},"b":"subscribe-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['316'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:50 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:51:50 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=subscribe-tornado-listener +version: 1 diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 65840894..7b98c637 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -70,13 +70,16 @@ def test_subscribe_publish_unsubscribe(self): self.pubnub.unsubscribe().channels(ch).execute() yield callback_messages.wait_for_disconnect() - @tornado.testing.gen_test() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/join_leave.yaml', + filter_query_parameters=['uuid', 'seqn']) + @tornado.testing.gen_test(timeout=15) def test_join_leave(self): - ch = helper.gen_channel("subscribe-test") + ch = "subscribe-tornado-ch" ch_pnpres = ch + "-pnpres" - self.pubnub.config.uuid = helper.gen_channel("messenger") - self.pubnub_listener.config.uuid = helper.gen_channel("listener") + self.pubnub.config.uuid = "subscribe-tornado-messenger" + self.pubnub_listener.config.uuid = "subscribe-tornado-listener" callback_presence = SubscribeListener() self.pubnub_listener.add_listener(callback_presence) self.pubnub_listener.subscribe().channels(ch).with_presence().execute() From c751d2b38ef7e95b0903ca383c80841a0f826389 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 10 Aug 2016 09:57:50 -0700 Subject: [PATCH 263/468] Add tornado subscribe cassettes --- .../tornado/subscribe/group_join_leave.yaml | 380 ++++++++++++++++++ .../subscribe/group_sub_pub_unsub.yaml | 230 +++++++++++ .../tornado/subscribe/group_sub_unsub.yaml | 164 ++++++++ tests/integrational/tornado/test_subscribe.py | 31 +- .../tornado/test_subscribe_cb.py | 69 ---- 5 files changed, 794 insertions(+), 80 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml create mode 100644 tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml create mode 100644 tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml delete mode 100644 tests/integrational/tornado/test_subscribe_cb.py diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml new file mode 100644 index 00000000..06a3f811 --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -0,0 +1,380 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:24 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['79'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708460251954075","r":3},"m":[]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:25 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460251954075 + response: + body: {string: '{"t":{"t":"14708460259366919","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460258668827","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "join", "timestamp": 1470846025, "uuid": "test-subscribe-listener", "occupancy": + 1},"b":"subscribe-test-group-pnpres"}]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:25 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['313'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708460259353278","r":3},"m":[]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:26 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460259366919 + response: + body: {string: '{"t":{"t":"14708460267928187","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460266713809","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "join", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": + 2},"b":"subscribe-test-group-pnpres"}]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:26 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['314'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460267928187 + response: + body: {string: '{"t":{"t":"14708460271883006","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460269981178","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "leave", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": + 1},"b":"subscribe-test-group-pnpres"}]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['315'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460271883006 + response: + body: {string: '{"t":{"t":"14708460276100655","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460273860352","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "leave", "timestamp": 1470846027, "uuid": "test-subscribe-listener", "occupancy": + 0},"b":"subscribe-test-group-pnpres"}]}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['314'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-test-channel + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['79'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger +version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml new file mode 100644 index 00000000..2acdcd27 --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -0,0 +1,230 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:03:24 GMT'] + - !!python/tuple + - Content-Length + - ['79'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708450055747125","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:03:25 GMT'] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '[1,"Sent","14708450057626682"]'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:03:25 GMT'] + - !!python/tuple + - Content-Length + - ['30'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708450055747125 + response: + body: {string: '{"t":{"t":"14708450057612306","r":3},"m":[{"a":"2","f":0,"i":"881d453a-4ef5-4dc3-a5a5-be11147ae030","s":1,"p":{"t":"14708450057626682","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:03:25 GMT'] + - !!python/tuple + - Content-Length + - ['273'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:03:26 GMT'] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 16:03:26 GMT'] + - !!python/tuple + - Content-Length + - ['79'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 +version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml new file mode 100644 index 00000000..030a8309 --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -0,0 +1,164 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:59:05 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Cache-Control + - [no-cache] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708447464037454","r":12},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:59:06 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:59:06 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Length + - ['79'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 15:59:06 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub] + - !!python/tuple + - Cache-Control + - [no-cache] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 7b98c637..a2d1e1d5 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -120,10 +120,13 @@ def setUp(self): self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=60) - def test_subscribe_unsubscribe(self): - ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscribe-group") + def test_group_subscribe_unsubscribe(self): + ch = "subscribe-unsubscribe-channel" + gr = "subscribe-unsubscribe-group" envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 @@ -141,10 +144,13 @@ def test_subscribe_unsubscribe(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=60) - def test_subscribe_publish_unsubscribe(self): - ch = helper.gen_channel("test-subscribe-pub-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-pub-unsubscribe-group") + def test_group_subscribe_publish_unsubscribe(self): + ch = "subscribe-unsubscribe-channel" + gr = "subscribe-unsubscribe-group" message = "hey" envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() @@ -174,13 +180,16 @@ def test_subscribe_publish_unsubscribe(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=60) - def test_join_leave(self): - self.pubnub.config.uuid = helper.gen_channel("messenger") - self.pubnub_listener.config.uuid = helper.gen_channel("listener") + def test_group_join_leave(self): + self.pubnub.config.uuid = "test-subscribe-messenger" + self.pubnub_listener.config.uuid = "test-subscribe-listener" - ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscribe-group") + ch = "subscribe-test-channel" + gr = "subscribe-test-group" envelope = yield self.pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 diff --git a/tests/integrational/tornado/test_subscribe_cb.py b/tests/integrational/tornado/test_subscribe_cb.py deleted file mode 100644 index 213cf1fc..00000000 --- a/tests/integrational/tornado/test_subscribe_cb.py +++ /dev/null @@ -1,69 +0,0 @@ -import logging -import pubnub as pn -import pubnub.utils as utils - -from tornado.testing import AsyncTestCase -from pubnub.callbacks import SubscribeCallback -from pubnub.pubnub_tornado import PubNubTornado - -from tests.helper import pnconf_sub_copy - -pn.set_stream_logger('pubnub', logging.DEBUG) - - -class SubscriptionTest(object): - def __init__(self): - super(SubscriptionTest, self).__init__() - self.pubnub = None - self.pubnub_listener = None - - -class TestMultipleChannelSubscriptions(AsyncTestCase, SubscriptionTest): - def setUp(self): - super(TestMultipleChannelSubscriptions, self).setUp() - self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - - def test_do(self): - _test = self - - class MyCallback(SubscribeCallback): - def __init__(self): - self.subscribe = False - self.unsubscribe = False - - def message(self, pubnub, result): - _test.io_loop.add_callback(_test._unsubscribe) - - def status(self, pubnub, status): - # connect event triggers only once, but probably should be triggered once for each channel - # TODO collect 3 subscribe - # TODO collect 3 unsubscribe - if utils.is_subscribed_event(status): - self.subscribe = True - _test.io_loop.add_callback(_test._publish) - elif utils.is_unsubscribed_event(status): - self.unsubscribe = True - pubnub.stop() - _test.stop() - - def presence(self, pubnub, presence): - pass - - callback = MyCallback() - self.pubnub.add_listener(callback) - self.pubnub.subscribe().channels("ch1").execute() - self.pubnub.subscribe().channels("ch2").execute() - self.pubnub.subscribe().channels("ch3").execute() - - self.wait() - - def _publish(self): - self.pubnub.publish().channel("ch2").message("hey").future() - - def _unsubscribe(self): - self.pubnub.unsubscribe().channels(["ch1", "ch2"]).execute() - self.io_loop.add_callback(self._unsubscribe2) - - def _unsubscribe2(self): - self.pubnub.unsubscribe().channels(["ch3"]).execute() - From 7b38728b064eeff5c53fb095aba222ee8f335f1b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 11 Aug 2016 12:47:51 -0700 Subject: [PATCH 264/468] Working on tornado here_now cassettes --- .../fixtures/tornado/here_now/single.yaml | 121 ++++++++++++++++++ tests/integrational/tornado/test_here_now.py | 56 +++++--- 2 files changed, 161 insertions(+), 16 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/here_now/single.yaml diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml new file mode 100644 index 00000000..49ebc86b --- /dev/null +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -0,0 +1,121 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} + headers: + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 17:18:34 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": + ["test-here-now-uuid"], "occupancy": 1}'} + headers: + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Content-Length + - ['104'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 17:18:38 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Wed, 10 Aug 2016 17:18:39 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 48130602..b3b3df52 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -1,11 +1,17 @@ +import logging import tornado +import tornado.gen +import pubnub as pn + from tornado import gen from tornado.testing import AsyncHTTPTestCase, AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado -from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep + +pn.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubAsyncHereNow(AsyncTestCase): @@ -13,11 +19,15 @@ def setUp(self): super(TestPubNubAsyncHereNow, self).setUp() self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/here_now/single.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=15) - def test_single_channel(self): - ch = helper.gen_channel("herenow-unit") + def test_here_now_single_channel(self): + ch = 'test-here-now-channel' + self.pubnub.config.uuid = 'test-here-now-uuid' yield connect_to_channel(self.pubnub, ch) - yield gen.sleep(4) + yield tornado.gen.sleep(10) env = yield self.pubnub.here_now() \ .channels(ch) \ .include_uuids(True) \ @@ -36,12 +46,22 @@ def test_single_channel(self): self.pubnub.stop() self.stop() - @tornado.testing.gen_test(timeout=15) - def test_multiple_channels(self): - ch1 = helper.gen_channel("here-now") - ch2 = helper.gen_channel("here-now") - yield connect_to_channel(self.pubnub, [ch1, ch2]) - yield gen.sleep(4) + # @use_cassette_and_stub_time_sleep( + # 'tests/integrational/fixtures/tornado/here_now/multiple.yaml', + # filter_query_parameters=['uuid', 'tt', 'tr']) + @tornado.testing.gen_test(timeout=120) + def test_here_now_multiple_channels(self): + ch1 = 'test-here-now-channel1' + ch2 = 'test-here-now-channel2' + self.pubnub.config.uuid = 'test-here-now-uuid' + print("connecting to the first...") + yield connect_to_channel(self.pubnub, ch1) + print("...connected to the first") + yield gen.sleep(1) + print("connecting to the second...") + self.pubnub.subscribe().channels(ch2).execute() + print("...connected to the second") + yield gen.sleep(15) env = yield self.pubnub.here_now() \ .channels([ch1, ch2]) \ .future() @@ -52,22 +72,26 @@ def test_multiple_channels(self): channels = env.result.channels assert len(channels) == 2 - assert channels[0].occupancy == 1 + assert channels[0].occupancy >= 1 assert channels[0].occupants[0].uuid == self.pubnub.uuid - assert channels[1].occupancy == 1 + assert channels[1].occupancy >= 1 assert channels[1].occupants[0].uuid == self.pubnub.uuid yield disconnect_from_channel(self.pubnub, [ch1, ch2]) self.pubnub.stop() self.stop() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/here_now/global.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=15) - def test_global(self): - ch1 = helper.gen_channel("here-now") - ch2 = helper.gen_channel("here-now") + def test_here_now_global(self): + ch1 = 'test-here-now-channel1' + ch2 = 'test-here-now-channel2' + self.pubnub.config.uuid = 'test-here-now-uuid' yield connect_to_channel(self.pubnub, [ch1, ch2]) - yield gen.sleep(4) + yield gen.sleep(6) env = yield self.pubnub.here_now().future() From aa340b2d1e1d30bb853f11a994df279bb18ca68e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 11 Aug 2016 12:50:17 -0700 Subject: [PATCH 265/468] Add asyncio time cassette --- tests/integrational/asyncio/test_time.py | 6 +++++- .../integrational/fixtures/asyncio/time/get.yaml | 15 +++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/integrational/fixtures/asyncio/time/get.yaml diff --git a/tests/integrational/asyncio/test_time.py b/tests/integrational/asyncio/test_time.py index db9b96e7..0d99f56d 100644 --- a/tests/integrational/asyncio/test_time.py +++ b/tests/integrational/asyncio/test_time.py @@ -3,10 +3,14 @@ from pubnub.pubnub_asyncio import PubNubAsyncio from tests.helper import pnconf +from tests.integrational.vcr_helper import pn_vcr +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/time/get.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio -def test_single_channel(event_loop): +def test_time(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) env = yield from pubnub.time().future() diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml new file mode 100644 index 00000000..e8c987c5 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/time/0 + response: + body: {string: '[14709447239268595]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 11 Aug 2016 19:45:23 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/time/0 +version: 1 From c9a76dab1e837383c135091064503a8ddcf7652a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 11 Aug 2016 13:13:21 -0700 Subject: [PATCH 266/468] Add asyncio state cassettes --- tests/integrational/asyncio/test_state.py | 23 +++++++++---- .../asyncio/state/multiple_channel.yaml | 33 +++++++++++++++++++ .../asyncio/state/single_channel.yaml | 33 +++++++++++++++++++ 3 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/state/multiple_channel.yaml create mode 100644 tests/integrational/fixtures/asyncio/state/single_channel.yaml diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index 302c253c..bd86d7d4 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -1,16 +1,20 @@ -import asyncio - import pytest from pubnub.pubnub_asyncio import PubNubAsyncio from tests import helper -from tests.helper import pnconf +from tests.helper import pnconf, pnconf_copy +from tests.integrational.vcr_helper import pn_vcr +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/state/single_channel.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_single_channel(event_loop): - pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) - ch = helper.gen_channel("herenow-unit") + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + ch = 'test-state-asyncio-ch' + pubnub.config.uuid = 'test-state-asyncio-uuid' state = {"name": "Alex", "count": 5} env = yield from pubnub.set_state() \ @@ -31,11 +35,16 @@ def test_single_channel(event_loop): pubnub.stop() +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/state/multiple_channel.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") + ch1 = 'test-state-asyncio-ch1' + ch2 = 'test-state-asyncio-ch2' + pubnub.config.uuid = 'test-state-asyncio-uuid' state = {"name": "Alex", "count": 5} env = yield from pubnub.set_state() \ diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml new file mode 100644 index 00000000..318feae3 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -0,0 +1,33 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-state-asyncio-ch1": + {"count": 5, "name": "Alex"}, "test-state-asyncio-ch2": {"count": 5, "name": + "Alex"}}}, "service": "Presence", "uuid": "test-state-asyncio-uuid"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml new file mode 100644 index 00000000..726e4f49 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -0,0 +1,33 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid + response: + body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": + "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": + "test-state-asyncio-ch"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid +version: 1 From 8d9b9e7f619111c01c116f4cc62a971963725702 Mon Sep 17 00:00:00 2001 From: crimsonred Date: Mon, 15 Aug 2016 11:45:37 +0530 Subject: [PATCH 267/468] Add changelog, features --- .pubnub.yml | 128 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 .pubnub.yml diff --git a/.pubnub.yml b/.pubnub.yml new file mode 100644 index 00000000..fe2e6795 --- /dev/null +++ b/.pubnub.yml @@ -0,0 +1,128 @@ +name: python +version: 3.8.2 +schema: 1 +scm: github.com/pubnub/python +changelog: + - version: v3.8.2 + date: + changes: + - type: improvement + text: Increasing maximum pool of connections and adjusting cryptodome package dependency. + - version: v3.8.1 + changes: + - type: bug + text: Fixing bug with state setting and subscribe confirmation. + - version: v3.8.0 + changes: + - type: feature + text: Mobile Gateway Functions. + - type: feature + text: Here Now for channel groups. + - type: feature + text: no-rep, store and fire(). + - version: v3.7.7 + changes: + - type: improvement + text: Adding .stop() method for base python async operations to exit the listener. + - version: v3.7.6 + changes: + - type: bug + text: fixed issues in receiving gzipped response for twisted. + - type: bug + text: fix for non reporting of dns lookup failure. + - type: bug + text: fix in time method. + - version: v3.7.5 + changes: + - type: improvement + text: increased timeout to 15 sec. + - version: v3.7.4 + changes: + - type: bug + text: added state and here_now. + - type: feature + text: added presence heartbeat support. + - version: v3.7.2 + changes: + - type: bug + text: fix for decryption bug in history API. + - type: improvement + text: module name changed to pubnub ( it was Pubnub earlier ), developers need to do from pubnub import Pubnub, instead of from Pubnub import Pubnub now. + - type: bug + text: fixed method arguments bug for presence API. + - type: improvement + text: subscribe_sync removed. + - type: bug + text: fix for issue where error callback not invoked for presence. + - type: feature + text: added state support in subscribe and here now. + - type: bug + text: fix for grant API with python 3. + - type: feature + text: added include_token option to history. + - version: v3.7.0 + changes: + - type: feature + text: Channel Groups functionality. + - type: improvement + text: Added Python Echo Server example. + - type: bug + text: Added missing timeout keyword arg. + - version: v3.5.3 + changes: + - type: bug + text: Added patch to handle quick net calls in Azure environments. + - type: bug + text: Presence fixes. + - type: bug + text: added daemon flag. + - version: v3.5.2 + changes: + - type: feature + text: Added pnsdk URL param to each request. + - type: improvement + text: Added grant/revoke/audit examples to README. + - type: bug + text: Fixed erroneous "Connected" error condition in console. + - type: improvement + text: Can now pass init vars via the CL on console. + - type: bug + text: Fixed UI issue of bracket color on console. + - type: improvement + text: Enable subscribing to "-pnpres" channel on console. + - version: v3.5.1 + changes: + - type: feature + text: Added subscribe_sync method. + - type: improvement + text: renamed pres_uuid argument for Pubnub constructor to uuid. + - version: v3.5.0 + changes: + - type: feature + text: Async subscribe allows for MX, unsubscribe calls. + - type: improvement + text: New method signatures -- be sure to check migration doc if upgrading. +features: + access: + - GRANT + - AUDIT + channel-groups: + - ADD-CHANNELS + - REMOVE-CHANNELS + - LIST-GROUPS + - LIST-CHANNELS-IN-GROUP + push: + - ADD-DEVICE-TO-CHANNELS + - REMOVE-DEVICE-FROM-CHANNELS + - LIST-CHANNELS-FROM-DEVICE + - REMOVE-DEVICE + presence: + - HERE-NOW + - WHERE-NOW + - SET-STATE + - GET-STATE + - HEARTBEAT + publish: + - STORE-FLAG + - FIRE + - REPLICATION-FLAG From ed751fe60c80c064f811993653e9cf2f4fe56c45 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 15 Aug 2016 07:16:07 -0700 Subject: [PATCH 268/468] Add asyncio CG cassettes --- .../asyncio/test_channel_groups.py | 50 +++++++----- .../groups/add_channel_remove_group.yaml | 63 +++++++++++++++ .../groups/add_remove_multiple_channels.yaml | 63 +++++++++++++++ .../groups/add_remove_single_channel.yaml | 76 +++++++++++++++++++ tests/integrational/vcr_helper.py | 40 +++++++--- 5 files changed, 264 insertions(+), 28 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml create mode 100644 tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml create mode 100644 tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index 45ad1fc0..cb145cea 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -4,24 +4,29 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub_asyncio import PubNubAsyncio -from tests import helper -from tests.helper import pnconf +from tests.helper import pnconf, pnconf_copy +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep, \ + get_sleeper, pn_vcr +@get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') @pytest.mark.asyncio -def test_add_remove_single_channel(event_loop): - pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) +def test_add_remove_single_channel(event_loop, sleeper=asyncio.sleep): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = 'test-channel-group-asyncio-uuid1' - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "test-channel-groups-asyncio-ch" + gr = "test-channel-groups-asyncio-cg" + yield from pubnub.publish().channel(ch).message("hey").future() # add env = yield from pubnub.add_channel_to_channel_group() \ .channels(ch).channel_group(gr).future() assert isinstance(env.result, PNChannelGroupsAddChannelResult) - yield from asyncio.sleep(1) + yield from sleeper(1) # list env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() @@ -35,7 +40,10 @@ def test_add_remove_single_channel(event_loop): assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) - yield from asyncio.sleep(1) + yield from sleeper(1) + + # change uuid to let vcr to distinguish list requests + pubnub.config.uuid = 'test-channel-group-asyncio-uuid2' # list env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() @@ -45,13 +53,15 @@ def test_add_remove_single_channel(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml') @pytest.mark.asyncio -def test_add_remove_multiple_channels(event_loop): +def test_add_remove_multiple_channels(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) - ch1 = helper.gen_channel("herenow-unit") - ch2 = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch1 = "channel-groups-tornado-ch1" + ch2 = "channel-groups-tornado-ch2" + gr = "channel-groups-tornado-cg" # add env = yield from pubnub.add_channel_to_channel_group() \ @@ -59,7 +69,7 @@ def test_add_remove_multiple_channels(event_loop): assert isinstance(env.result, PNChannelGroupsAddChannelResult) - yield from asyncio.sleep(1) + yield from sleeper(1) # list env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() @@ -74,7 +84,7 @@ def test_add_remove_multiple_channels(event_loop): assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) - yield from asyncio.sleep(1) + yield from sleeper(1) # list env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() @@ -84,12 +94,14 @@ def test_add_remove_multiple_channels(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml') @pytest.mark.asyncio -def test_add_channel_remove_group(event_loop): +def test_add_channel_remove_group(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) - ch = helper.gen_channel("herenow-unit") - gr = helper.gen_channel("herenow-unit") + ch = "channel-groups-tornado-ch" + gr = "channel-groups-tornado-cg" # add env = yield from pubnub.add_channel_to_channel_group() \ @@ -97,7 +109,7 @@ def test_add_channel_remove_group(event_loop): assert isinstance(env.result, PNChannelGroupsAddChannelResult) - yield from asyncio.sleep(1) + yield from sleeper(1) # list env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() @@ -110,7 +122,7 @@ def test_add_channel_remove_group(event_loop): assert isinstance(env.result, PNChannelGroupsRemoveGroupResult) - yield from asyncio.sleep(1) + yield from sleeper(1) # list env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml new file mode 100644 index 00000000..a141bf82 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -0,0 +1,63 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:27 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], + "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": + false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '156', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:28 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:28 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, + "service": "channel-registry", "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '129', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:29 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml new file mode 100644 index 00000000..229adc08 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -0,0 +1,63 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:13 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", + "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": + "channel-registry", "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '187', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:14 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:14 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, + "service": "channel-registry", "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '129', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:15 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml new file mode 100644 index 00000000..a4910c38 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -0,0 +1,76 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22 + response: + body: {string: '[1,"Sent","14712686904977512"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:50 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:50 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + response: + body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], + "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '166', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:55 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:55 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + response: + body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, + "service": "channel-registry", "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '134', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:59 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index c4bc5bfd..bb05e90f 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -118,26 +118,48 @@ def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): import tornado.gen @tornado.gen.coroutine - def returner(): + def tornado_returner(): return def _inner(f): @patch('time.sleep', return_value=None) - @patch('tornado.gen.sleep', return_value=returner()) - @patch('asyncio.sleep', return_value=returner()) + @patch('tornado.gen.sleep', return_value=tornado_returner()) @six.wraps(f) - def stubbed(*args): + def stubbed(*args, **kwargs): with context as cassette: largs = list(args) - largs.pop(1) - largs.pop(1) - largs.pop(1) - return f(*largs) + # 0 - index + largs.pop(0) + largs.pop(0) + return f(*largs, **kwargs) @six.wraps(f) def original(*args): with context as cassette: - return f(*args) + yield from f(*args) return stubbed if len(cs) > 0 else original + return _inner + + +def get_sleeper(cassette_name): + """ + Loads cassette just to check if it is in record or playback mode + """ + context = pn_vcr.use_cassette(cassette_name) + cs = context.cls(path=cassette_name).load(path=cassette_name) + + import asyncio + + @asyncio.coroutine + def fake_sleeper(v): + yield from asyncio.sleep(0) + + def decorate(f): + @six.wraps(f) + def call(*args, event_loop=None): + yield from f(*args, sleeper=(fake_sleeper if (len(cs) > 0) else asyncio.sleep), event_loop=event_loop) + + return call + return decorate From cdebbd3cfda7ee91ea54e0c33e6ca6d751af4a80 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 15 Aug 2016 10:26:48 -0700 Subject: [PATCH 269/468] Add asyncio herenow cassettes --- .../asyncio/test_channel_groups.py | 3 +- tests/integrational/asyncio/test_here_now.py | 32 ++++++++----- .../fixtures/asyncio/here_now/global.yaml | 48 +++++++++++++++++++ .../asyncio/here_now/multiple_channels.yaml | 47 ++++++++++++++++++ .../asyncio/here_now/single_channel.yaml | 45 +++++++++++++++++ 5 files changed, 162 insertions(+), 13 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/here_now/global.yaml create mode 100644 tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml create mode 100644 tests/integrational/fixtures/asyncio/here_now/single_channel.yaml diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index cb145cea..46fb738b 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -5,8 +5,7 @@ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub_asyncio import PubNubAsyncio from tests.helper import pnconf, pnconf_copy -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep, \ - get_sleeper, pn_vcr +from tests.integrational.vcr_helper import get_sleeper, pn_vcr @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index 8d25b760..82862384 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -4,12 +4,16 @@ from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener from tests import helper from tests.helper import pnconf_sub_copy +from tests.integrational.vcr_helper import get_sleeper, pn_vcr +@get_sleeper('tests/integrational/fixtures/asyncio/here_now/single_channel.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/single_channel.yaml') @pytest.mark.asyncio -def test_single_channel(event_loop): +def test_single_channel(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - ch = helper.gen_channel("herenow-unit") + pubnub.config.uuid = 'test-here-now-asyncio-uuid1' + ch = "test-here-now-asyncio-ch" callback = SubscribeListener() pubnub.add_listener(callback) @@ -17,7 +21,7 @@ def test_single_channel(event_loop): yield from callback.wait_for_connect() - yield from asyncio.sleep(5) + yield from sleeper(5) env = yield from pubnub.here_now() \ .channels(ch) \ @@ -39,12 +43,15 @@ def test_single_channel(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml') @pytest.mark.asyncio -def test_multiple_channels(event_loop): +def test_multiple_channels(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = 'test-here-now-asyncio-uuid1' - ch1 = helper.gen_channel("here-now") - ch2 = helper.gen_channel("here-now") + ch1 = "test-here-now-asyncio-ch1" + ch2 = "test-here-now-asyncio-ch2" callback = SubscribeListener() pubnub.add_listener(callback) @@ -52,7 +59,7 @@ def test_multiple_channels(event_loop): yield from callback.wait_for_connect() - yield from asyncio.sleep(5) + yield from sleeper(5) env = yield from pubnub.here_now() \ .channels([ch1, ch2]) \ .future() @@ -74,12 +81,15 @@ def test_multiple_channels(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/here_now/global.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/global.yaml') @pytest.mark.asyncio -def test_global(event_loop): +def test_global(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = 'test-here-now-asyncio-uuid1' - ch1 = helper.gen_channel("here-now") - ch2 = helper.gen_channel("here-now") + ch1 = "test-here-now-asyncio-ch1" + ch2 = "test-here-now-asyncio-ch2" callback = SubscribeListener() pubnub.add_listener(callback) @@ -87,7 +97,7 @@ def test_global(event_loop): yield from callback.wait_for_connect() - yield from asyncio.sleep(5) + yield from sleeper(5) env = yield from pubnub.here_now().future() diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml new file mode 100644 index 00000000..3e9d7d7c --- /dev/null +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -0,0 +1,48 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0 + response: + body: {string: '{"t":{"t":"14712819052616473","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 17:25:05 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": + {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-channel-groups-asyncio-ch": + {"uuids": ["0575fb6a-30eb-4d6e-919d-62c18b98e741"], "occupancy": 1}, "test-here-now-asyncio-ch1": + {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}}, "total_channels": + 3, "total_occupancy": 3}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '406', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 17:25:10 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 17:25:11 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml new file mode 100644 index 00000000..6e038181 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -0,0 +1,47 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0 + response: + body: {string: '{"t":{"t":"14712816918483557","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 17:21:31 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": + {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": + {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}}, "total_channels": + 2, "total_occupancy": 2}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 17:21:37 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 17:21:37 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml new file mode 100644 index 00000000..61993da2 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -0,0 +1,45 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0 + response: + body: {string: '{"t":{"t":"14712725201485441","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:48:40 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-here-now-asyncio-uuid1&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": + ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 14:48:45 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-here-now-asyncio-uuid1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 14:48:45 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-here-now-asyncio-uuid1 +version: 1 From 90a569c07bd193399c7e21db8da3d4b372b84564 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 15 Aug 2016 11:13:36 -0700 Subject: [PATCH 270/468] Add asyncio pam cassettes --- tests/integrational/asyncio/test_pam.py | 54 +++++++++++-------- .../fixtures/asyncio/pam/global_level.yaml | 34 ++++++++++++ .../asyncio/pam/multiple_channel_groups.yaml | 34 ++++++++++++ .../multiple_channel_groups_with_auth.yaml | 34 ++++++++++++ .../asyncio/pam/multiple_channels.yaml | 34 ++++++++++++ .../pam/multiple_channels_with_auth.yaml | 34 ++++++++++++ .../fixtures/asyncio/pam/single_channel.yaml | 34 ++++++++++++ .../asyncio/pam/single_channel_group.yaml | 34 ++++++++++++ .../pam/single_channel_group_with_auth.yaml | 34 ++++++++++++ .../asyncio/pam/single_channel_with_auth.yaml | 34 ++++++++++++ 10 files changed, 338 insertions(+), 22 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/pam/global_level.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index b78870ac..337bc030 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -4,8 +4,10 @@ from pubnub.pubnub_asyncio import PubNubAsyncio from tests import helper from tests.helper import pnconf_pam_copy +from tests.integrational.vcr_helper import pn_vcr +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/global_level.yaml') @pytest.mark.asyncio def test_global_level(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -36,11 +38,12 @@ def test_global_level(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel.yaml') @pytest.mark.asyncio -def test_single_channel(event_loop): +def test_single_channelx(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" - ch = helper.gen_channel("pam-channel") + ch = "test-pam-asyncio-ch" env = (yield from pubnub.grant() .channels(ch) @@ -65,12 +68,13 @@ def test_single_channel(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml') @pytest.mark.asyncio -def test_single_channel_with_auth(event_loop): +def test_single_channel_with_authxx(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = "my_uuid" - ch = helper.gen_channel("pam-channel") - auth = helper.gen_channel("pam-auth-key") + pubnub.config.uuid = "test-pam-asyncio-uuid" + ch = "test-pam-asyncio-ch" + auth = "test-pam-asyncio-auth" env = (yield from pubnub.grant() .channels(ch) @@ -97,12 +101,13 @@ def test_single_channel_with_auth(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml') @pytest.mark.asyncio def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = "my_uuid" - ch1 = helper.gen_channel("pam-channel") - ch2 = helper.gen_channel("pam-channel") + pubnub.config.uuid = "test-pam-asyncio-uuid" + ch1 = "test-pam-asyncio-ch1" + ch2 = "test-pam-asyncio-ch2" env = (yield from pubnub.grant() .channels([ch1, ch2]) @@ -133,13 +138,14 @@ def test_multiple_channels(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml') @pytest.mark.asyncio def test_multiple_channels_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" - ch1 = helper.gen_channel("pam-channel") - ch2 = helper.gen_channel("pam-channel") - auth = helper.gen_channel("pam-auth-key") + ch1 = "test-pam-asyncio-ch1" + ch2 = "test-pam-asyncio-ch2" + auth = "test-pam-asyncio-auth" env = (yield from pubnub.grant() .channels([ch1, ch2]) @@ -171,11 +177,12 @@ def test_multiple_channels_with_auth(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml') @pytest.mark.asyncio def test_single_channel_group(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = "my_uuid" - cg = helper.gen_channel("pam-cg") + pubnub.config.uuid = "test-pam-asyncio-uuid" + cg = "test-pam-asyncio-cg" env = (yield from pubnub.grant() .channel_groups(cg) @@ -202,12 +209,13 @@ def test_single_channel_group(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml') @pytest.mark.asyncio def test_single_channel_group_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = "my_uuid" - gr = helper.gen_channel("pam-cg") - auth = helper.gen_channel("pam-auth-key") + pubnub.config.uuid = "test-pam-asyncio-uuid" + gr = "test-pam-asyncio-cg" + auth = "test-pam-asyncio-auth" env = (yield from pubnub.grant() .channel_groups(gr) @@ -235,12 +243,13 @@ def test_single_channel_group_with_auth(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml') @pytest.mark.asyncio def test_multiple_channel_groups(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" - gr1 = helper.gen_channel("pam-group1") - gr2 = helper.gen_channel("pam-group2") + gr1 = "test-pam-asyncio-cg1" + gr2 = "test-pam-asyncio-cg2" env = (yield from pubnub.grant() .channel_groups([gr1, gr2]) @@ -271,13 +280,14 @@ def test_multiple_channel_groups(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml') @pytest.mark.asyncio def test_multiple_channel_groups_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" - gr1 = helper.gen_channel("pam-group1") - gr2 = helper.gen_channel("pam-group2") - auth = helper.gen_channel("pam-auth-key") + gr1 = "test-pam-asyncio-cg1" + gr2 = "test-pam-asyncio-cg2" + auth = "test-pam-asyncio-auth" env = (yield from pubnub.grant() .channel_groups([gr1, gr2]) diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml new file mode 100644 index 00000000..35e0068a --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:41:46 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=FMscuWtoNxH5EfNLOMVeiyE9n6_0tBFq_Ddt6PzJKuM=×tamp=1471282905&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:41:46 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=vVzDyIRI5d-99Exy23cDS1HYDRj6fuO_gSOphycEQL0=×tamp=1471282906&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml new file mode 100644 index 00000000..42a11ecc --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 18:10:33 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=py3e-s6DDL5VC2RcD-i806KjlSD7lnjWjltPHAb7dqs=×tamp=1471284633&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '285', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 18:10:33 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=CJX1bcCggOh51DIARCijdH_UoCMqDLk5PhmbAeR-tQ8=×tamp=1471284633&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml new file mode 100644 index 00000000..08a9b4fe --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 18:12:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=IceeIrXnsdrhtWq0ZnU_zEInVdCqJD50AN5babEiVZU=×tamp=1471284720&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1439,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1439,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 18:12:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=CEf6fMJiJknAjwUA2peYQ09O-c8xYRirRQSiD0luMeo=×tamp=1471284720&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml new file mode 100644 index 00000000..146762f8 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:48:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=KI61E_iS5pXVI7_pUCdBvCcU-WyyrnpaaNxh8ck74l4=×tamp=1471283290&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '273', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:48:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=OLE5ZYD8PCVzW60LiHz3hFRQgMWXBtW9Z6MTsz4RIJ0=×tamp=1471283290&uuid=test-pam-asyncio-uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml new file mode 100644 index 00000000..b96b93ec --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:51:32 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ujy96Mu13B1yjL4g8q9mVz2WxW--zQcgeZ0c0uTqJf4=×tamp=1471283491&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1437,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1437,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:51:32 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=_MTgGmGtaxPnGpX5sAK1CFXss6MiEW_zTIU4gy-H9UA=×tamp=1471283492&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml new file mode 100644 index 00000000..0e6ef65d --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:45:07 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Qqp3h8RMv47PrVpvUvXOp3KyADsrCHk88RhT4M-3m-o=×tamp=1471283107&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:45:07 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=CvrjDhexNpypxjX7fMuadDtSXmzin0F2KsmaPx4MAS8=×tamp=1471283107&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml new file mode 100644 index 00000000..f54fca6e --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:55:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Z4L-nkAyFW7drU30I3LA5qScS2a0RwvWUWKO-mTv57E=×tamp=1471283726&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:55:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=yAaNjbrOmA8RMK9kCn75sewStTnetm36bMbeXVII470=×tamp=1471283727&uuid=test-pam-asyncio-uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml new file mode 100644 index 00000000..87c22154 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 18:09:19 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=6jwrLN7pZufEpXbEItxPmTdMf5K_cvKb5vArCG3gAH0=×tamp=1471284559&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 18:09:19 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=DnsrJa-_tZYRdcCwPpU01-pEyIiuORL2xryFJ3Fjlck=×tamp=1471284559&uuid=test-pam-asyncio-uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml new file mode 100644 index 00000000..39e6104a --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:46:22 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=1kZ71QREgGPXwOPdDL5tj622i8WCbpW5lmRUQFUvMIU=×tamp=1471283182&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f + response: + body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, + 15 Aug 2016 17:46:22 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=oKw6zL3z08u1KTf8MAHfFe5c8x1IeXASC0l4Og4D7j0=×tamp=1471283182&uuid=test-pam-asyncio-uuid +version: 1 From 5dc7e9d361b4913a0d7809b52e3a4ea4fd26dae6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 15 Aug 2016 11:22:25 -0700 Subject: [PATCH 271/468] Add asyncio secure cassettes --- tests/integrational/asyncio/test_ssl.py | 8 ++++++-- .../fixtures/asyncio/secure/ssl.yaml | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/secure/ssl.yaml diff --git a/tests/integrational/asyncio/test_ssl.py b/tests/integrational/asyncio/test_ssl.py index f1ebbb52..4256cf64 100644 --- a/tests/integrational/asyncio/test_ssl.py +++ b/tests/integrational/asyncio/test_ssl.py @@ -3,16 +3,20 @@ import pytest import pubnub as pn -from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException -from tests.helper import pnconf_copy, pnconf_enc_copy, pnconf_ssl_copy +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests.helper import pnconf_ssl_copy +from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) ch = "asyncio-int-publish" +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/secure/ssl.yaml') @pytest.mark.asyncio def test_publish_string_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_ssl_copy(), custom_event_loop=event_loop) res = yield from pubnub.publish().channel(ch).message("hey").future() assert res.result.timetoken > 0 + + pubnub.stop() diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml new file mode 100644 index 00000000..f9552a16 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22 + response: + body: {string: '[1,"Sent","14712852509407928"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:20:50 GMT'} + status: {code: 200, message: OK} + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=f27f996c-9622-4195-97b1-276d70b64647&seqn=1 +version: 1 From bc2744c6238543b6b7384a53efbd3284c7c4d968 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 15 Aug 2016 11:37:38 -0700 Subject: [PATCH 272/468] Add a couple of asyncio subscribe cassettes --- tests/integrational/asyncio/test_subscribe.py | 8 ++- .../asyncio/subscription/sub_pub_unsub.yaml | 56 +++++++++++++++++++ .../asyncio/subscription/sub_unsub.yaml | 30 ++++++++++ 3 files changed, 92 insertions(+), 2 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml create mode 100644 tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index f0c2a36c..0b93566f 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -7,13 +7,15 @@ from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener from tests import helper from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy +from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml') @pytest.mark.asyncio def test_subscribe_unsubscribe(event_loop): - channel = helper.gen_channel("test-sub-unsub") + channel = "test-subscribe-asyncio-ch" pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -29,12 +31,14 @@ def test_subscribe_unsubscribe(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml') @pytest.mark.asyncio def test_subscribe_publish_unsubscribe(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = 'test-subscribe-asyncio-uuid' callback = SubscribeListener() - channel = helper.gen_channel("test-sub-pub-unsub") + channel = "test-subscribe-asyncio-ch" message = "hey" pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml new file mode 100644 index 00000000..569f8ad4 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -0,0 +1,56 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0 + response: + body: {string: '{"t":{"t":"14712862160637522","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:36:56 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22 + response: + body: {string: '[1,"Sent","14712862162733563"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:36:56 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0 + response: + body: {string: '{"t":{"t":"14712862162734773","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14712862162733563","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '226', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:36:56 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=14712862160637522&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tr=3 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 18:36:56 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml new file mode 100644 index 00000000..9f69782e --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -0,0 +1,30 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0 + response: + body: {string: '{"t":{"t":"14712860403624693","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:34:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=25cecd26-ed92-4c42-b948-125838393e82&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 15 Aug 2016 18:34:00 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=25cecd26-ed92-4c42-b948-125838393e82 +version: 1 From 0b33a34e730eaea38588ceccd7eb5f036936da74 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 16 Aug 2016 05:52:33 -0700 Subject: [PATCH 273/468] Add asyncio subscribe cassettes --- tests/integrational/asyncio/test_subscribe.py | 62 +++++--- .../asyncio/subscription/cg_join_leave.yaml | 133 ++++++++++++++++++ .../subscription/cg_sub_pub_unsub.yaml | 86 +++++++++++ .../asyncio/subscription/cg_sub_unsub.yaml | 60 ++++++++ .../asyncio/subscription/join_leave.yaml | 103 ++++++++++++++ .../asyncio/subscription/sub_pub_unsub.yaml | 30 ++-- .../subscription/sub_pub_unsub_enc.yaml | 56 ++++++++ .../asyncio/subscription/sub_unsub.yaml | 16 +-- 8 files changed, 501 insertions(+), 45 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml create mode 100644 tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml create mode 100644 tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml create mode 100644 tests/integrational/fixtures/asyncio/subscription/join_leave.yaml create mode 100644 tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 0b93566f..d23ef600 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -5,14 +5,14 @@ from pubnub.models.consumer.pubsub import PNMessageResult from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener -from tests import helper from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy -from tests.integrational.vcr_helper import pn_vcr +from tests.integrational.vcr_helper import pn_vcr, get_sleeper pn.set_stream_logger('pubnub', logging.DEBUG) -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio def test_subscribe_unsubscribe(event_loop): channel = "test-subscribe-asyncio-ch" @@ -72,12 +72,14 @@ def test_subscribe_publish_unsubscribe(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml') @pytest.mark.asyncio def test_encrypted_subscribe_publish_unsubscribe(event_loop): pubnub = PubNubAsyncio(pnconf_enc_sub_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = 'test-subscribe-asyncio-uuid' callback = SubscribeListener() - channel = helper.gen_channel("test-sub-pub-unsub") + channel = "test-subscribe-asyncio-ch" message = "hey" pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() @@ -111,16 +113,17 @@ def test_encrypted_subscribe_publish_unsubscribe(event_loop): pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/join_leave.yaml') @pytest.mark.asyncio -def test_join_leave(event_loop): - channel = helper.gen_channel("test-subscribe-join-leave") +def test_join_leave_blah(event_loop): + channel = "test-subscribe-asyncio-join-leave-ch" presence_channel = "%s-pnpres" % channel pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = helper.gen_channel("messenger") - pubnub_listener.config.uuid = helper.gen_channel("listener") + pubnub.config.uuid = "test-subscribe-asyncio-messenger" + pubnub_listener.config.uuid = "test-subscribe-asyncio-listener" callback_presence = SubscribeListener() callback_messages = SubscribeListener() @@ -159,17 +162,20 @@ def test_join_leave(event_loop): pubnub_listener.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio -def test_cg_subscribe_unsubscribe(event_loop): - ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscribe-group") +def test_cg_subscribe_unsubscribe(event_loop, sleeper=asyncio.sleep): + ch = "test-subscribe-asyncio-channel" + gr = "test-subscribe-asyncio-group" pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - yield from asyncio.sleep(1) + yield from sleeper(3) callback_messages = SubscribeListener() pubnub.add_listener(callback_messages) @@ -185,10 +191,13 @@ def test_cg_subscribe_unsubscribe(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio -def test_cg_subscribe_publish_unsubscribe(event_loop): - ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscribe-group") +def test_cg_subscribe_publish_unsubscribe(event_loop, sleeper=asyncio.sleep): + ch = "test-subscribe-asyncio-channel" + gr = "test-subscribe-asyncio-group" message = "hey" pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -196,7 +205,7 @@ def test_cg_subscribe_publish_unsubscribe(event_loop): envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - yield from asyncio.sleep(1) + yield from sleeper(1) callback_messages = SubscribeListener() pubnub.add_listener(callback_messages) @@ -226,21 +235,23 @@ def test_cg_subscribe_publish_unsubscribe(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml') @pytest.mark.asyncio -def test_cg_join_leave(event_loop): +def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = helper.gen_channel("messenger") - pubnub_listener.config.uuid = helper.gen_channel("listener") + pubnub.config.uuid = "test-subscribe-asyncio-messenger" + pubnub_listener.config.uuid = "test-subscribe-asyncio-listener" - ch = helper.gen_channel("test-subscribe-unsubscribe-channel") - gr = helper.gen_channel("test-subscribe-unsubscribe-group") + ch = "test-subscribe-asyncio-join-leave-cg-channel" + gr = "test-subscribe-asyncio-join-leave-cg-group" envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - yield from asyncio.sleep(1) + yield from sleeper(1) callback_messages = SubscribeListener() callback_presence = SubscribeListener() @@ -248,8 +259,10 @@ def test_cg_join_leave(event_loop): pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() yield from callback_presence.wait_for_connect() + print("connected #1") prs_envelope = yield from callback_presence.wait_for_presence_on(ch) + print("presence #2") assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub_listener.uuid assert prs_envelope.actual_channel == ch + "-pnpres" @@ -257,10 +270,12 @@ def test_cg_join_leave(event_loop): pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() + print("subscribed to cg #3") callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_connect()) presence_messages_future= asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) yield from asyncio.wait([callback_messages_future, presence_messages_future]) + print("connect/presence #4") prs_envelope = presence_messages_future.result() assert prs_envelope.event == 'join' @@ -273,6 +288,7 @@ def test_cg_join_leave(event_loop): callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_disconnect()) presence_messages_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) yield from asyncio.wait([callback_messages_future, presence_messages_future]) + print("disconnect/presence #5") prs_envelope = presence_messages_future.result() assert prs_envelope.event == 'leave' @@ -282,9 +298,11 @@ def test_cg_join_leave(event_loop): pubnub_listener.unsubscribe().channel_groups(gr).execute() yield from callback_presence.wait_for_disconnect() + print("presence disconnect #6") envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + print("channel removed #7") pubnub.stop() pubnub_listener.stop() diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml new file mode 100644 index 00000000..e067bc7f --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -0,0 +1,133 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:07 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14713511480343359","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511480343359 + response: + body: {string: '{"t":{"t":"14713511489324977","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511488470095","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "join", "timestamp": 1471351148, "uuid": "test-subscribe-asyncio-listener", + "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511480343359 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14713511488599816","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511489324977 + response: + body: {string: '{"t":{"t":"14713511498339636","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511497874401","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "join", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:09 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511489324977 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511498339636 + response: + body: {string: '{"t":{"t":"14713511502190714","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511499971846","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "leave", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511498339636 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml new file mode 100644 index 00000000..8ed5049f --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -0,0 +1,86 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14713511466073676","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14713511467409673"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511466073676 + response: + body: {string: '{"t":{"t":"14713511467422512","r":12},"m":[{"a":"2","f":0,"i":"f73c5107-519c-42fd-b1e1-7f9377430082","s":1,"p":{"t":"14713511467409673","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511466073676 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml new file mode 100644 index 00000000..75858dc4 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -0,0 +1,60 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14713511453005433","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml new file mode 100644 index 00000000..c11693e2 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -0,0 +1,103 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713498789397698","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713511412634058","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511411661104","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-listener", + "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713511412354502","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 3},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713511418815177","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511418422322","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "leave", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:01 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 569f8ad4..841318f6 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -4,53 +4,53 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '{"t":{"t":"14712862160637522","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14713511399140178","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:36:56 GMT'} + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '[1,"Sent","14712862162733563"]'} + body: {string: '[1,"Sent","14713511400414851"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:36:56 GMT'} + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '{"t":{"t":"14712862162734773","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14712862162733563","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} + body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511400414851","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '226', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:36:56 GMT'} + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=14712862160637522&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 18:36:56 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml new file mode 100644 index 00000000..c4f3048e --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -0,0 +1,56 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14713511404390559"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14713511404397571","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511404390559","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index 9f69782e..a297f961 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -4,27 +4,27 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '{"t":{"t":"14712860403624693","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14713511396585426","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:34:00 GMT'} + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=25cecd26-ed92-4c42-b948-125838393e82&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 18:34:00 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 12:38:59 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=25cecd26-ed92-4c42-b948-125838393e82 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 From 4e67d6643070ad8784932010d715e2e9bc02f0a9 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 16 Aug 2016 06:58:35 -0700 Subject: [PATCH 274/468] Fix asyncio groups cassettes --- .../asyncio/test_channel_groups.py | 9 ++++--- .../groups/add_channel_remove_group.yaml | 24 +++++++++---------- .../groups/add_remove_multiple_channels.yaml | 24 +++++++++---------- .../groups/add_remove_single_channel.yaml | 24 +++++++++---------- 4 files changed, 42 insertions(+), 39 deletions(-) diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index 46fb738b..fc68223e 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -9,7 +9,8 @@ @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio def test_add_remove_single_channel(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -53,7 +54,8 @@ def test_add_remove_single_channel(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio def test_add_remove_multiple_channels(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) @@ -94,7 +96,8 @@ def test_add_remove_multiple_channels(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio def test_add_channel_remove_group(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index a141bf82..88e53d48 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -4,60 +4,60 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:27 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '156', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:28 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:28 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '129', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:10:29 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:04 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=ba46124a-80a4-43f8-8f9f-7fa6f7fdbb4d&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 229adc08..1f2b05f8 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -4,60 +4,60 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:13 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '187', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:14 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:14 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '129', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:58:15 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=00b5e947-4f75-47bc-8a30-218aabc30e63&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index a4910c38..7b0a95f3 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 response: - body: {string: '[1,"Sent","14712686904977512"]'} + body: {string: '[1,"Sent","14713558782056075"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:50 GMT'} + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT'} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: @@ -17,29 +17,29 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:50 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '166', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:55 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 @@ -48,13 +48,13 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:55 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch @@ -63,13 +63,13 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '134', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 15 Aug 2016 13:44:59 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 From 0f918d12d7f38d7aa1e6c63efad88c8491853ff3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 17 Aug 2016 00:56:23 -0700 Subject: [PATCH 275/468] Fix asyncio here_now cassettes --- tests/integrational/asyncio/test_here_now.py | 17 ++++++++++--- .../fixtures/asyncio/here_now/global.yaml | 24 +++++++++---------- .../asyncio/here_now/multiple_channels.yaml | 22 ++++++++--------- .../asyncio/here_now/single_channel.yaml | 24 +++++++++---------- 4 files changed, 49 insertions(+), 38 deletions(-) diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index 82862384..ca8ad54d 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -2,7 +2,6 @@ import pytest from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener -from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.vcr_helper import get_sleeper, pn_vcr @@ -44,7 +43,13 @@ def test_single_channel(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml', + match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], + match_on_kwargs={ + 'string_list_in_path': { + 'positions': [4, 6] + } + }) @pytest.mark.asyncio def test_multiple_channels(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -82,7 +87,13 @@ def test_multiple_channels(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/here_now/global.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/global.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/global.yaml', + match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], + match_on_kwargs={ + 'string_list_in_path': { + 'positions': [4] + } + }) @pytest.mark.asyncio def test_global(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 3e9d7d7c..751489c5 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '{"t":{"t":"14712819052616473","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14714204724402473","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 17:25:05 GMT'} + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:32 GMT'} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: @@ -17,17 +17,17 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": - {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-channel-groups-asyncio-ch": - {"uuids": ["0575fb6a-30eb-4d6e-919d-62c18b98e741"], "occupancy": 1}, "test-here-now-asyncio-ch1": - {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}}, "total_channels": + {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": + {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-subscribe-asyncio-join-leave-ch": + {"uuids": ["0575fb6a-30eb-4d6e-919d-62c18b98e741"], "occupancy": 1}}, "total_channels": 3, "total_occupancy": 3}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '406', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 17:25:10 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '412', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, + 17 Aug 2016 07:54:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: @@ -35,14 +35,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 17:25:11 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, + 17 Aug 2016 07:54:38 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 6e038181..0f48a306 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '{"t":{"t":"14712816918483557","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14713594568087822","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 17:21:31 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -25,8 +25,8 @@ interactions: 2, "total_occupancy": 2}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 17:21:37 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: @@ -34,14 +34,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 17:21:37 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index 61993da2..32071c48 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -4,42 +4,42 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 response: - body: {string: '{"t":{"t":"14712725201485441","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14713563292410522","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 14:48:40 GMT'} + charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:29 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-here-now-asyncio-uuid1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 14:48:45 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-here-now-asyncio-uuid1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 15 Aug 2016 14:48:45 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-here-now-asyncio-uuid1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 version: 1 From 943ea3268fc1693eeb8f8a07a8d25db409c3f3b0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 17 Aug 2016 00:57:19 -0700 Subject: [PATCH 276/468] Add VCR string list in path matcher --- tests/integrational/vcr_helper.py | 37 +++++++++++++++++++++++++++++++ tests/unit/test_vcr_helper.py | 22 ++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 tests/unit/test_vcr_helper.py diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index bb05e90f..d5b82bee 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -85,6 +85,42 @@ def object_in_body_matcher(r1, r2, decrypter=None): return True +def string_list_in_path_matcher(r1, r2, positions=None): + """ + For here_now requests: + /v2/presence/sub-key/my_sub_key/channel/ch1,ch2?key=val + /v2/presence/sub-key/my_sub_key/channel/ch2,ch1?key=val + """ + + if positions is None: + positions = [] + elif isinstance(positions, six.integer_types): + positions = [positions] + + try: + path1 = r1.path.split('/') + path2 = r2.path.split('/') + + for k, v in enumerate(path1): + if k in positions: + ary1 = v.split(',') + ary1.sort() + ary2 = path2[k].split(',') + ary2.sort() + + assert ary1 == ary2 + else: + assert v == path2[k] + + except (AssertionError, IndexError) as e: + return False + except Exception as e: + print("Non-Assertion Exception: %s" % e) + raise + + return True + + def check_the_difference_matcher(r1, r2): """ A helper to check the difference between two requests """ @@ -109,6 +145,7 @@ def check_the_difference_matcher(r1, r2): pn_vcr.register_matcher('object_in_path', object_in_path_matcher) pn_vcr.register_matcher('object_in_body', object_in_body_matcher) pn_vcr.register_matcher('check_the_difference', check_the_difference_matcher) +pn_vcr.register_matcher('string_list_in_path', string_list_in_path_matcher) def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py new file mode 100644 index 00000000..31840d49 --- /dev/null +++ b/tests/unit/test_vcr_helper.py @@ -0,0 +1,22 @@ +import unittest + +from tests.integrational.vcr_helper import string_list_in_path_matcher + + +class Request(object): + def __init__(self, path): + self.path = path + + +class TestPreparePAMArguments(unittest.TestCase): + def test_string_list_in_path_matcher(self): + r1 = Request('/v2/presence/sub-key/my_sub_key/channel/ch1,ch2') + r2 = Request('/v2/presence/sub-key/my_sub_key/channel/ch2,ch1') + r3 = Request('/v2/presence/sub-key/my_sub_key/channel/ch2,ch3') + r4 = Request('/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0') + r5 = Request('/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0') + + assert string_list_in_path_matcher(r1, r2, 6) + assert not string_list_in_path_matcher(r2, r3, 6) + assert string_list_in_path_matcher(r4, r5, 4) + assert not string_list_in_path_matcher(r4, r5) From 23d73e05afe6e304f9c3431ac97ef9582975d0ee Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 17 Aug 2016 01:43:59 -0700 Subject: [PATCH 277/468] Remove asyncio pam cassettes --- .../fixtures/asyncio/pam/global_level.yaml | 34 ------------------- .../asyncio/pam/multiple_channel_groups.yaml | 34 ------------------- .../multiple_channel_groups_with_auth.yaml | 34 ------------------- .../asyncio/pam/multiple_channels.yaml | 34 ------------------- .../pam/multiple_channels_with_auth.yaml | 34 ------------------- .../fixtures/asyncio/pam/single_channel.yaml | 34 ------------------- .../asyncio/pam/single_channel_group.yaml | 34 ------------------- .../pam/single_channel_group_with_auth.yaml | 34 ------------------- .../asyncio/pam/single_channel_with_auth.yaml | 34 ------------------- 9 files changed, 306 deletions(-) delete mode 100644 tests/integrational/fixtures/asyncio/pam/global_level.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml deleted file mode 100644 index 35e0068a..00000000 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:41:46 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=FMscuWtoNxH5EfNLOMVeiyE9n6_0tBFq_Ddt6PzJKuM=×tamp=1471282905&uuid=my_uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:41:46 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=vVzDyIRI5d-99Exy23cDS1HYDRj6fuO_gSOphycEQL0=×tamp=1471282906&uuid=my_uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml deleted file mode 100644 index 42a11ecc..00000000 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 18:10:33 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=py3e-s6DDL5VC2RcD-i806KjlSD7lnjWjltPHAb7dqs=×tamp=1471284633&uuid=my_uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '285', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 18:10:33 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=CJX1bcCggOh51DIARCijdH_UoCMqDLk5PhmbAeR-tQ8=×tamp=1471284633&uuid=my_uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml deleted file mode 100644 index 08a9b4fe..00000000 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 18:12:00 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=IceeIrXnsdrhtWq0ZnU_zEInVdCqJD50AN5babEiVZU=×tamp=1471284720&uuid=my_uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1439,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1439,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 18:12:00 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=CEf6fMJiJknAjwUA2peYQ09O-c8xYRirRQSiD0luMeo=×tamp=1471284720&uuid=my_uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml deleted file mode 100644 index 146762f8..00000000 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:48:10 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=KI61E_iS5pXVI7_pUCdBvCcU-WyyrnpaaNxh8ck74l4=×tamp=1471283290&uuid=test-pam-asyncio-uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '273', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:48:10 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=OLE5ZYD8PCVzW60LiHz3hFRQgMWXBtW9Z6MTsz4RIJ0=×tamp=1471283290&uuid=test-pam-asyncio-uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml deleted file mode 100644 index b96b93ec..00000000 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:51:32 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ujy96Mu13B1yjL4g8q9mVz2WxW--zQcgeZ0c0uTqJf4=×tamp=1471283491&uuid=my_uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1437,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1437,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:51:32 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=_MTgGmGtaxPnGpX5sAK1CFXss6MiEW_zTIU4gy-H9UA=×tamp=1471283492&uuid=my_uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml deleted file mode 100644 index 0e6ef65d..00000000 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:45:07 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Qqp3h8RMv47PrVpvUvXOp3KyADsrCHk88RhT4M-3m-o=×tamp=1471283107&uuid=my_uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:45:07 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=CvrjDhexNpypxjX7fMuadDtSXmzin0F2KsmaPx4MAS8=×tamp=1471283107&uuid=my_uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml deleted file mode 100644 index f54fca6e..00000000 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:55:27 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Z4L-nkAyFW7drU30I3LA5qScS2a0RwvWUWKO-mTv57E=×tamp=1471283726&uuid=test-pam-asyncio-uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:55:27 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=yAaNjbrOmA8RMK9kCn75sewStTnetm36bMbeXVII470=×tamp=1471283727&uuid=test-pam-asyncio-uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml deleted file mode 100644 index 87c22154..00000000 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 18:09:19 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=6jwrLN7pZufEpXbEItxPmTdMf5K_cvKb5vArCG3gAH0=×tamp=1471284559&uuid=test-pam-asyncio-uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 18:09:19 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=DnsrJa-_tZYRdcCwPpU01-pEyIiuORL2xryFJ3Fjlck=×tamp=1471284559&uuid=test-pam-asyncio-uuid -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml deleted file mode 100644 index 39e6104a..00000000 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ /dev/null @@ -1,34 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:46:22 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=1kZ71QREgGPXwOPdDL5tj622i8WCbpW5lmRUQFUvMIU=×tamp=1471283182&uuid=test-pam-asyncio-uuid&w=1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] - method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f - response: - body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access - Manager","status":200}'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Mon, - 15 Aug 2016 17:46:22 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=oKw6zL3z08u1KTf8MAHfFe5c8x1IeXASC0l4Og4D7j0=×tamp=1471283182&uuid=test-pam-asyncio-uuid -version: 1 From ef8b1770cfbf79040fe812c394f14a5993d18195 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 17 Aug 2016 04:45:33 -0700 Subject: [PATCH 278/468] Add updated asyncio pam cassetttes --- tests/integrational/asyncio/test_pam.py | 52 ++++++++++++++----- .../fixtures/asyncio/pam/global_level.yaml | 34 ++++++++++++ .../asyncio/pam/multiple_channel_groups.yaml | 34 ++++++++++++ .../multiple_channel_groups_with_auth.yaml | 34 ++++++++++++ .../asyncio/pam/multiple_channels.yaml | 34 ++++++++++++ .../pam/multiple_channels_with_auth.yaml | 34 ++++++++++++ .../fixtures/asyncio/pam/single_channel.yaml | 34 ++++++++++++ .../asyncio/pam/single_channel_group.yaml | 34 ++++++++++++ .../pam/single_channel_group_with_auth.yaml | 34 ++++++++++++ .../asyncio/pam/single_channel_with_auth.yaml | 34 ++++++++++++ 10 files changed, 346 insertions(+), 12 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/pam/global_level.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml create mode 100644 tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index 337bc030..b54f349c 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -2,12 +2,12 @@ from pubnub.models.consumer.access_manager import PNAccessManagerGrantResult, PNAccessManagerAuditResult from pubnub.pubnub_asyncio import PubNubAsyncio -from tests import helper from tests.helper import pnconf_pam_copy from tests.integrational.vcr_helper import pn_vcr -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/global_level.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/global_level.yaml', + filter_query_parameters=['signature', 'timestamp']) @pytest.mark.asyncio def test_global_level(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -38,9 +38,10 @@ def test_global_level(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel.yaml', + filter_query_parameters=['signature', 'timestamp']) @pytest.mark.asyncio -def test_single_channelx(event_loop): +def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "my_uuid" ch = "test-pam-asyncio-ch" @@ -68,9 +69,10 @@ def test_single_channelx(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml', + filter_query_parameters=['signature', 'timestamp']) @pytest.mark.asyncio -def test_single_channel_with_authxx(event_loop): +def test_single_channel_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) pubnub.config.uuid = "test-pam-asyncio-uuid" ch = "test-pam-asyncio-ch" @@ -101,7 +103,13 @@ def test_single_channel_with_authxx(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml', + filter_query_parameters=['signature', 'timestamp'], + match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], + match_on_kwargs={ + 'list_keys': ['channel'], + 'filter_keys': ['signature', 'timestamp'] + }) @pytest.mark.asyncio def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -138,7 +146,13 @@ def test_multiple_channels(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml', + filter_query_parameters=['signature', 'timestamp'], + match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], + match_on_kwargs={ + 'list_keys': ['channel'], + 'filter_keys': ['signature', 'timestamp'] + }) @pytest.mark.asyncio def test_multiple_channels_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -177,7 +191,8 @@ def test_multiple_channels_with_auth(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml', + filter_query_parameters=['signature', 'timestamp']) @pytest.mark.asyncio def test_single_channel_group(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -209,7 +224,8 @@ def test_single_channel_group(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml', + filter_query_parameters=['signature', 'timestamp']) @pytest.mark.asyncio def test_single_channel_group_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -243,7 +259,13 @@ def test_single_channel_group_with_auth(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml', + filter_query_parameters=['signature', 'timestamp'], + match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], + match_on_kwargs={ + 'list_keys': ['channel-group'], + 'filter_keys': ['signature', 'timestamp'] + }) @pytest.mark.asyncio def test_multiple_channel_groups(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -280,7 +302,13 @@ def test_multiple_channel_groups(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml', + filter_query_parameters=['signature', 'timestamp'], + match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], + match_on_kwargs={ + 'list_keys': ['channel-group'], + 'filter_keys': ['signature', 'timestamp'] + }) @pytest.mark.asyncio def test_multiple_channel_groups_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml new file mode 100644 index 00000000..99dd6115 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:19 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=s6I6O_HXhrgRZzktnFBiuMzOo3HtQ_7KNocH7X8f1Hw=×tamp=1471423639&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + response: + body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:19 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PJGrON0IoRDTRvohroHUTNIAVb6emRTUZ0tc5dJ1I4M=×tamp=1471423639&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml new file mode 100644 index 00000000..76601240 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 11:41:37 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 11:41:37 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml new file mode 100644 index 00000000..e0692709 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 11:41:37 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 11:41:38 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml new file mode 100644 index 00000000..5c765a96 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=test-pam-asyncio-uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 09:36:11 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-pam-asyncio-uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 09:36:12 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml new file mode 100644 index 00000000..bb60b607 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 09:35:22 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '345', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 09:35:22 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml new file mode 100644 index 00000000..b8b481a9 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:52 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:53 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml new file mode 100644 index 00000000..fd2bec61 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:53 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:53 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml new file mode 100644 index 00000000..d01966b9 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:54 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + response: + body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:54 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid +version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml new file mode 100644 index 00000000..64373e81 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -0,0 +1,34 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + response: + body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:53 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + response: + body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, + 17 Aug 2016 08:47:53 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid +version: 1 From 48644fc375a6a754c67f6b2c9a099768f50773ab Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 17 Aug 2016 04:47:29 -0700 Subject: [PATCH 279/468] Fix asyncio ssl cassettes --- tests/integrational/asyncio/test_ssl.py | 3 ++- tests/integrational/fixtures/asyncio/secure/ssl.yaml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/integrational/asyncio/test_ssl.py b/tests/integrational/asyncio/test_ssl.py index 4256cf64..7f0db1e6 100644 --- a/tests/integrational/asyncio/test_ssl.py +++ b/tests/integrational/asyncio/test_ssl.py @@ -12,7 +12,8 @@ ch = "asyncio-int-publish" -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/secure/ssl.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/secure/ssl.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio def test_publish_string_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_ssl_copy(), custom_event_loop=event_loop) diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index f9552a16..81f2f9c9 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 response: - body: {string: '[1,"Sent","14712852509407928"]'} + body: {string: '[1,"Sent","14714344166454996"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 15 Aug 2016 18:20:50 GMT'} + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:46:56 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=f27f996c-9622-4195-97b1-276d70b64647&seqn=1 + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 version: 1 From 5756eecbaaf8905b0e682415c40015e84a19ff24 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 17 Aug 2016 05:18:07 -0700 Subject: [PATCH 280/468] Add asyncio where_now cassettes --- tests/integrational/asyncio/test_where_now.py | 33 +++++++++----- .../asyncio/where_now/multiple_channels.yaml | 45 +++++++++++++++++++ .../asyncio/where_now/single_channel.yaml | 45 +++++++++++++++++++ tests/integrational/tornado/test_where_now.py | 10 +++-- 4 files changed, 120 insertions(+), 13 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml create mode 100644 tests/integrational/fixtures/asyncio/where_now/single_channel.yaml diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index 7bce16d1..d62fae03 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -2,15 +2,19 @@ import pytest from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener -from tests import helper from tests.helper import pnconf_sub_copy +from tests.integrational.vcr_helper import pn_vcr, get_sleeper +@get_sleeper('tests/integrational/fixtures/asyncio/where_now/single_channel.yaml') +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/where_now/single_channel.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio -def test_single_channel(event_loop): +def test_single_channel(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - ch = helper.gen_channel("wherenow-asyncio-channel") - uuid = helper.gen_channel("wherenow-asyncio-uuid") + ch = 'test-where-now-asyncio-ch' + uuid = 'test-where-now-asyncio-uuid' pubnub.config.uuid = uuid callback = SubscribeListener() @@ -19,7 +23,7 @@ def test_single_channel(event_loop): yield from callback.wait_for_connect() - yield from asyncio.sleep(2) + yield from sleeper(2) env = yield from pubnub.where_now() \ .uuid(uuid) \ @@ -36,13 +40,22 @@ def test_single_channel(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml') +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml', + match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], + match_on_kwargs={ + 'string_list_in_path': { + 'positions': [4] + } + }) @pytest.mark.asyncio -def test_multiple_channels(event_loop): +def test_multiple_channels(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - ch1 = helper.gen_channel("here-now") - ch2 = helper.gen_channel("here-now") - uuid = helper.gen_channel("wherenow-asyncio-uuid") + ch1 = 'test-where-now-asyncio-ch1' + ch2 = 'test-where-now-asyncio-ch2' + uuid = 'test-where-now-asyncio-uuid' pubnub.config.uuid = uuid callback = SubscribeListener() @@ -51,7 +64,7 @@ def test_multiple_channels(event_loop): yield from callback.wait_for_connect() - yield from asyncio.sleep(7) + yield from sleeper(7) env = yield from pubnub.where_now() \ .uuid(uuid) \ diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml new file mode 100644 index 00000000..807d96bb --- /dev/null +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -0,0 +1,45 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"t":{"t":"14714362383675346","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:18 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", + "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, + 17 Aug 2016 12:17:25 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, + 17 Aug 2016 12:17:26 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml new file mode 100644 index 00000000..ecd5b36f --- /dev/null +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -0,0 +1,45 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14714351489282409","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:09 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-where-now-asyncio-uuid +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, + "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, + 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-where-now-asyncio-uuid +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, + 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-where-now-asyncio-uuid +version: 1 diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py index eb0f8054..969d9ac4 100644 --- a/tests/integrational/tornado/test_where_now.py +++ b/tests/integrational/tornado/test_where_now.py @@ -6,6 +6,7 @@ from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep class TestPubNubAsyncWhereNow(AsyncTestCase): @@ -13,14 +14,17 @@ def setUp(self): super(TestPubNubAsyncWhereNow, self).setUp() self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + # @use_cassette_and_stub_time_sleep( + # 'tests/integrational/fixtures/tornado/where_now/single_channel.yaml', + # filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=15) - def test_single_channel(self): - ch = helper.gen_channel("wherenow-asyncio-channel") + def test_where_now_single_channel(self): + ch = "where-now-tornado-ch" uuid = helper.gen_channel("wherenow-asyncio-uuid") self.pubnub.config.uuid = uuid yield connect_to_channel(self.pubnub, ch) - yield gen.sleep(7) + yield gen.sleep(10) env = yield self.pubnub.where_now() \ .uuid(uuid) \ .future() From bdcc3e261215e847c9c4572fd3e98c1c17f5f0fb Mon Sep 17 00:00:00 2001 From: crimsonred Date: Thu, 18 Aug 2016 13:11:24 +0530 Subject: [PATCH 281/468] Update .pubnub.yml --- .pubnub.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pubnub.yml b/.pubnub.yml index fe2e6795..294eafe7 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -105,7 +105,6 @@ changelog: features: access: - GRANT - - AUDIT channel-groups: - ADD-CHANNELS - REMOVE-CHANNELS From 736df4bb3028ff758abc0035542daa941550e7c4 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 18 Aug 2016 02:26:58 -0700 Subject: [PATCH 282/468] Add updated asyncio publish cassettes --- tests/integrational/asyncio/test_publish.py | 95 ++++++++++++++++--- tests/integrational/asyncio/test_state.py | 1 - .../fixtures/asyncio/publish/invalid_key.yaml | 15 +++ .../fixtures/asyncio/publish/meta_object.yaml | 15 +++ .../asyncio/publish/mixed_via_get.yaml | 54 +++++++++++ .../publish/mixed_via_get_encrypted.yaml | 54 +++++++++++ .../asyncio/publish/mixed_via_post.yaml | 54 +++++++++++ .../publish/mixed_via_post_encrypted.yaml | 54 +++++++++++ .../asyncio/publish/object_via_get.yaml | 15 +++ .../publish/object_via_get_encrypted.yaml | 15 +++ .../asyncio/publish/object_via_post.yaml | 15 +++ .../publish/object_via_post_encrypted.yaml | 15 +++ 12 files changed, 388 insertions(+), 14 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/publish/invalid_key.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/meta_object.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/object_via_get.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/object_via_post.yaml create mode 100644 tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index 0885d028..470fecfe 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -9,7 +9,8 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException -from tests.helper import pnconf_copy, pnconf_enc_copy +from tests.helper import pnconf_copy, pnconf_enc_copy, gen_decrypt_func +from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) @@ -45,58 +46,116 @@ def assert_success_publish_post(pubnub, msg): yield from assert_success_await(pubnub.publish().channel(ch).message(msg).use_post(True)) +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml', + filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio -def test_publish_string_via_get(event_loop): +def test_publish_mixed_via_get(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_get(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_get(pubnub, 5)), asyncio.ensure_future(assert_success_publish_get(pubnub, True)), - asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"])), - asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))) + asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"]))) pubnub.stop() +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/publish/object_via_get.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']) @pytest.mark.asyncio -def test_publish_string_via_post(event_loop): +def test_publish_object_via_get(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + yield from asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True})) + + pubnub.stop() + + +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_mixed_via_post(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_post(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_post(pubnub, 5)), asyncio.ensure_future(assert_success_publish_post(pubnub, True)), - asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"])), - asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))) + asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"]))) + + pubnub.stop() + + +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/object_via_post.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'scheme', 'host', 'port', 'path', 'query', 'object_in_body']) +@pytest.mark.asyncio +def test_publish_object_via_post(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + yield from asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True})) pubnub.stop() +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio -def test_publish_string_via_get_encrypted(event_loop): +def test_publish_mixed_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_get(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_get(pubnub, 5)), asyncio.ensure_future(assert_success_publish_get(pubnub, True)), - asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"])), - asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))) + asyncio.ensure_future(assert_success_publish_get(pubnub, ["hi", "hi2", "hi3"]))) pubnub.stop() +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['host', 'method', 'query', 'object_in_path'], + match_on_kwargs={'object_in_path': { + 'decrypter': gen_decrypt_func('testKey')}}) @pytest.mark.asyncio -def test_publish_string_via_post_encrypted(event_loop): +def test_publish_object_via_get_encrypted(event_loop): + pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) + yield from asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True})) + + pubnub.stop() + + +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'body']) +@pytest.mark.asyncio +def test_publish_mixed_via_post_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) yield from asyncio.gather( asyncio.ensure_future(assert_success_publish_post(pubnub, "hi")), asyncio.ensure_future(assert_success_publish_post(pubnub, 5)), asyncio.ensure_future(assert_success_publish_post(pubnub, True)), - asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"])), - asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))) + asyncio.ensure_future(assert_success_publish_post(pubnub, ["hi", "hi2", "hi3"]))) pubnub.stop() +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'object_in_body'], + match_on_kwargs={'object_in_body': { + 'decrypter': gen_decrypt_func('testKey')}}) +@pytest.mark.asyncio +def test_publish_object_via_post_encrypted(event_loop): + pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) + yield from asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True})) + + pubnub.stop() + @pytest.mark.asyncio def test_error_missing_message(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -124,6 +183,10 @@ def method(): pubnub.stop() +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/meta_object.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['host', 'method', 'path', 'meta_object_in_query']) @pytest.mark.asyncio def test_publish_with_meta(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -132,6 +195,9 @@ def test_publish_with_meta(event_loop): pubnub.stop() +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/do_not_store.yaml', + filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio def test_publish_do_not_store(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -148,6 +214,9 @@ def assert_server_side_error_yield(pub, expected_err_msg): assert expected_err_msg in str(e) +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/invalid_key.yaml', + filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio def test_error_invalid_key(event_loop): conf = PNConfiguration() diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index bd86d7d4..57ffdc91 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -1,7 +1,6 @@ import pytest from pubnub.pubnub_asyncio import PubNubAsyncio -from tests import helper from tests.helper import pnconf, pnconf_copy from tests.integrational.vcr_helper import pn_vcr diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml new file mode 100644 index 00000000..10f82367 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[0,"Invalid Key","14715121286597316"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:22:08 GMT'} + status: {code: 400, message: INVALID} + url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml new file mode 100644 index 00000000..8ba94236 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715122016841196"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:23:21 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.0&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml new file mode 100644 index 00000000..0d54d0ac --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -0,0 +1,54 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531073577558"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531073592350"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=3 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531073603443"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531073604938"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=4 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml new file mode 100644 index 00000000..5a1dd7eb --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -0,0 +1,54 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715101539265931"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715101539286406"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=3 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715101539293096"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715101539315353"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=4 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml new file mode 100644 index 00000000..1d0f60d4 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -0,0 +1,54 @@ +interactions: +- request: + body: 'true' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531007838319"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: '"hi"' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531007890145"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: '5' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531007894502"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +- request: + body: '["hi", "hi2", "hi3"]' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531007926933"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml new file mode 100644 index 00000000..8402c61e --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -0,0 +1,54 @@ +interactions: +- request: + body: '"Dt7qBesIhJT2DweUJc2HRQ=="' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715113500557815"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 +- request: + body: '"jw/KAwQAoKtQfHyYrROqSQ=="' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715113500599883"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 +- request: + body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715113500607388"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 +- request: + body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715113500616628"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml new file mode 100644 index 00000000..fb8c0a09 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714531074414363"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml new file mode 100644 index 00000000..d08b4800 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715102088417575"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:50:08 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml new file mode 100644 index 00000000..8cd1db9b --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: '{"online": true, "name": "Alex"}' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14714530475966145"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:57:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml new file mode 100644 index 00000000..a7662618 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: POST + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '[1,"Sent","14715113905714923"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:50 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 +version: 1 From 820e57a24990f81497a972caa2e27e2978c101b1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 18 Aug 2016 02:59:25 -0700 Subject: [PATCH 283/468] Add asyncio publish do not store cassette --- .../fixtures/asyncio/publish/do_not_store.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 tests/integrational/fixtures/asyncio/publish/do_not_store.yaml diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml new file mode 100644 index 00000000..933fd554 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&store=0 + response: + body: {string: '[1,"Sent","14715124518965795"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:27:31 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 +version: 1 From 9920e3b1be7c7fb0d86215f037b54fee8e3c8043 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 18 Aug 2016 03:07:44 -0700 Subject: [PATCH 284/468] Fix vcr matchers --- tests/integrational/tornado/test_channel_groups.py | 4 ++-- tests/integrational/tornado/test_publish.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py index 57842e5f..fa0c143a 100644 --- a/tests/integrational/tornado/test_channel_groups.py +++ b/tests/integrational/tornado/test_channel_groups.py @@ -16,7 +16,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid']) @tornado.testing.gen_test def test_add_remove_single_channel(self): ch = "channel-groups-tornado-ch" @@ -54,7 +54,7 @@ def test_add_remove_single_channel(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid']) @tornado.testing.gen_test def test_add_remove_multiple_channels(self): ch1 = "channel-groups-tornado-ch1" diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index c2473a96..3cf1f741 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -93,15 +93,15 @@ def test_publish_mixed_via_get(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_get.yaml', filter_query_parameters=['uuid', 'seqn'], - match_on=['host', 'method', 'query', 'object_in_path']) + match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']) def test_publish_object_via_get(self): self.assert_success_publish_get({"name": "Alex", "online": True}) @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml', filter_query_parameters=['uuid', 'seqn'], - match_on=['host', 'method', 'path', 'query', 'body']) - def test_publish_string_via_post(self): + match_on=['method', 'scheme', 'host', 'port', 'path', 'query']) + def test_publish_mixed_via_post(self): self.assert_success_publish_post("hi") self.assert_success_publish_post(5) self.assert_success_publish_post(True) From 6708a3784395790b35590b24478c6869e042a777 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 18 Aug 2016 03:09:40 -0700 Subject: [PATCH 285/468] Update VCR heleprs --- tests/integrational/vcr_helper.py | 61 ++++++++++++++++++++++++++++--- tests/unit/test_vcr_helper.py | 14 +++++-- 2 files changed, 66 insertions(+), 9 deletions(-) diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index d5b82bee..92a10395 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -121,6 +121,54 @@ def string_list_in_path_matcher(r1, r2, positions=None): return True +def string_list_in_query_matcher(r1, r2, list_keys=None, filter_keys=None): + """ + For here_now requests: + + /v1/auth/grant/sub-key/my_sub_key?channel=ch1,ch2×tamp=123 + /v1/auth/grant/sub-key/my_sub_key?channel=ch2,ch1×tamp=124 + + NOTICE: The :filter_query_parameters: cassette param should be specified alongside with :filter_keys: + """ + + if list_keys is None: + list_keys = [] + elif isinstance(list_keys, six.string_types): + list_keys = [list_keys] + + if filter_keys is None: + filter_keys = [] + elif isinstance(filter_keys, six.string_types): + filter_keys = [filter_keys] + + try: + list1 = r1.query + list2 = r2.query + + for ik, tp in enumerate(list1): + k, v = tp + if k in filter_keys: + continue + + if k in list_keys: + ary1 = v.split(',') + ary1.sort() + ary2 = list2[ik][1].split(',') + ary2.sort() + + assert ary1 == ary2 + else: + assert v == list2[ik][1] + + except (AssertionError, IndexError) as e: + return False + except Exception as e: + print("Non-Assertion Exception: %s" % e) + raise + + return True + + def check_the_difference_matcher(r1, r2): """ A helper to check the difference between two requests """ @@ -146,6 +194,7 @@ def check_the_difference_matcher(r1, r2): pn_vcr.register_matcher('object_in_body', object_in_body_matcher) pn_vcr.register_matcher('check_the_difference', check_the_difference_matcher) pn_vcr.register_matcher('string_list_in_path', string_list_in_path_matcher) +pn_vcr.register_matcher('string_list_in_query', string_list_in_query_matcher) def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): @@ -155,25 +204,25 @@ def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): import tornado.gen @tornado.gen.coroutine - def tornado_returner(): + def returner(): return def _inner(f): @patch('time.sleep', return_value=None) - @patch('tornado.gen.sleep', return_value=tornado_returner()) + @patch('tornado.gen.sleep', return_value=returner()) @six.wraps(f) def stubbed(*args, **kwargs): with context as cassette: largs = list(args) - # 0 - index - largs.pop(0) - largs.pop(0) + # 1 - index + largs.pop(1) + largs.pop(1) return f(*largs, **kwargs) @six.wraps(f) def original(*args): with context as cassette: - yield from f(*args) + return f(*args) return stubbed if len(cs) > 0 else original diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index 31840d49..d40ae774 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -1,14 +1,15 @@ import unittest -from tests.integrational.vcr_helper import string_list_in_path_matcher +from tests.integrational.vcr_helper import string_list_in_path_matcher, string_list_in_query_matcher class Request(object): - def __init__(self, path): + def __init__(self, path=None, query=None): self.path = path + self.query = query -class TestPreparePAMArguments(unittest.TestCase): +class TestVCRMatchers(unittest.TestCase): def test_string_list_in_path_matcher(self): r1 = Request('/v2/presence/sub-key/my_sub_key/channel/ch1,ch2') r2 = Request('/v2/presence/sub-key/my_sub_key/channel/ch2,ch1') @@ -20,3 +21,10 @@ def test_string_list_in_path_matcher(self): assert not string_list_in_path_matcher(r2, r3, 6) assert string_list_in_path_matcher(r4, r5, 4) assert not string_list_in_path_matcher(r4, r5) + + def test_string_list_in_path_query_matcher(self): + r1 = Request(query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) + r2 = Request(query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) + + assert string_list_in_query_matcher(r1, r2, ['channel']) + assert not string_list_in_query_matcher(r1, r2) From 5988355b2f8299a34753ed8efc37b7e7ac00dd44 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 04:51:54 -0700 Subject: [PATCH 286/468] Change Tornado platform call cancellation behaviour --- pubnub/endpoints/endpoint.py | 5 +- pubnub/pubnub_tornado.py | 308 ++++++++---------- .../fixtures/tornado/here_now/global.yaml | 189 +++++++++++ .../fixtures/tornado/here_now/multiple.yaml | 156 +++++++++ tests/integrational/tornado/test_here_now.py | 25 +- tests/integrational/tornado/test_subscribe.py | 60 +++- 6 files changed, 562 insertions(+), 181 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/here_now/global.yaml create mode 100644 tests/integrational/fixtures/tornado/here_now/multiple.yaml diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 8beca7ab..e856cf0e 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -102,13 +102,12 @@ def callback_wrapper(envelope): return self.pubnub.request_async(self.name(), options, callback_wrapper, self._cancellation_event) - def future(self, intermediate_key_future=False): + def future(self): def handler(): self.validate_params() return self.options() - return self.pubnub.request_future(intermediate_key_future=intermediate_key_future, - options_func=handler, + return self.pubnub.request_future(options_func=handler, create_response=self.create_response, create_status_response=self.create_status_response, cancellation_event=self._cancellation_event diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 319149a0..e6748658 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -31,43 +31,7 @@ logger = logging.getLogger("pubnub") - -class PubNubTornadoSimpleAsyncHTTPClient(SimpleAsyncHTTPClient): - def reset_request(self, key_object): - if key_object in self.waiting: - self.io_loop.add_callback(self._on_timeout, key_object) - - def fetch_impl(self, request, initial_callback): - key = object() - - def after_key_callback(callback): - self.queue.append((key, request, callback)) - if not len(self.active) < self.max_clients: - timeout_handle = self.io_loop.add_timeout( - self.io_loop.time() + min(request.connect_timeout, - request.request_timeout), - functools.partial(self._on_timeout, key)) - else: - timeout_handle = None - self.waiting[key] = (request, callback, timeout_handle) - self._process_queue() - if self.queue: - gen_log.debug("max_clients limit reached, request queued. " - "%d active, %d queued requests." % ( - len(self.active), len(self.queue))) - - key_response = _TornadoKeyResponse(key, after_key_callback) - self.io_loop.add_callback(initial_callback, key_response) - - -class _TornadoKeyResponse(object): - def __init__(self, key, after_key_callback): - self.error = None - self.key = key - self.continue_callback = after_key_callback - - -tornado.httpclient.AsyncHTTPClient.configure(PubNubTornadoSimpleAsyncHTTPClient) +tornado.httpclient.AsyncHTTPClient.configure(SimpleAsyncHTTPClient) class PubNubTornado(PubNubCore): @@ -128,24 +92,7 @@ def request_async(self, *args): def request_deferred(self, *args): raise NotImplementedError - def request_future(self, intermediate_key_future, options_func, - create_response, create_status_response, cancellation_event): - key_future = self.request_future_key(options_func, - create_response, - create_status_response, - cancellation_event) - if intermediate_key_future: - return key_future - else: - @tornado.gen.coroutine - def cb(): - key, call = yield key_future - blah = yield call - raise tornado.gen.Return(blah) - - return cb() - - def request_future_key(self, options_func, create_response, + def request_future(self, options_func, create_response, create_status_response, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -155,7 +102,7 @@ def request_future_key(self, options_func, create_response, if options.operation_type is PNOperationType.PNPublishOperation: options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() - key_future = Future() + future = Future() url = utils.build_url(self.config.scheme(), self.config.origin, options.path, options.query_string) @@ -169,103 +116,97 @@ def request_future_key(self, options_func, create_response, connect_timeout=options.connect_timeout, request_timeout=options.request_timeout) - def key_callback(key_response): - future = Future() - key_future.set_result((key_response.key, future)) - - def response_callback(response): - if cancellation_event is not None and cancellation_event.is_set(): - return - - body = response.body - response_info = None - status_category = PNStatusCategory.PNUnknownCategory - - if response is not None: - request_url = six.moves.urllib.parse.urlparse(response.effective_url) - query = six.moves.urllib.parse.parse_qs(request_url.query) - uuid = None - auth_key = None - - if 'uuid' in query and len(query['uuid']) > 0: - uuid = query['uuid'][0] - - if 'auth_key' in query and len(query['auth_key']) > 0: - auth_key = query['auth_key'][0] + def response_callback(response): + if cancellation_event is not None and cancellation_event.is_set(): + return + + body = response.body + response_info = None + status_category = PNStatusCategory.PNUnknownCategory + + if response is not None: + request_url = six.moves.urllib.parse.urlparse(response.effective_url) + query = six.moves.urllib.parse.parse_qs(request_url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + + response_info = ResponseInfo( + status_code=response.code, + tls_enabled='https' == request_url.scheme, + origin=request_url.hostname, + uuid=uuid, + auth_key=auth_key, + client_request=response.request + ) + + if body is not None and len(body) > 0: + try: + data = json.loads(body) + except TypeError: + try: + data = json.loads(body.decode("utf-8")) + except ValueError: + tornado_result = TornadoEnvelope( + create_response(None), + create_status_response(status_category, response, response_info, PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error') + ) + ) + future.set_exception(tornado_result) + return + else: + data = "N/A" - response_info = ResponseInfo( - status_code=response.code, - tls_enabled='https' == request_url.scheme, - origin=request_url.hostname, - uuid=uuid, - auth_key=auth_key, - client_request=response.request - ) + logger.debug(data) - if body is not None and len(body) > 0: - try: - data = json.loads(body) - except TypeError: - try: - data = json.loads(body.decode("utf-8")) - except ValueError: - tornado_result = TornadoEnvelope( - create_response(None), - create_status_response(status_category, response, response_info, PubNubException( - pn_error=PNERR_JSON_DECODING_FAILED, - errormsg='json decode error') - ) - ) - future.set_exception(tornado_result) - return - else: - data = "N/A" - - logger.debug(data) - - if response.error is not None: - if response.code >= 500: - err = PNERR_SERVER_ERROR - data = str(response.error) - else: - err = PNERR_CLIENT_ERROR - - if response.code == 403: - status_category = PNStatusCategory.PNAccessDeniedCategory - - if response.code == 400: - status_category = PNStatusCategory.PNBadRequestCategory - - if response.code == 599: - status_category = PNStatusCategory.PNTimeoutCategory - - future.set_exception(PubNubTornadoException( - result=data, - status=create_status_response(status_category, data, response_info, - PubNubException( - errormsg=data, - pn_error=err, - status_code=response.code, - )) - )) + if response.error is not None: + if response.code >= 500: + err = PNERR_SERVER_ERROR + data = str(response.error) else: - future.set_result(TornadoEnvelope( - result=create_response(data), - status=create_status_response( - PNStatusCategory.PNAcknowledgmentCategory, - data, - response_info, - None) - )) - - key_response.continue_callback(response_callback) + err = PNERR_CLIENT_ERROR + + if response.code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + + if response.code == 400: + status_category = PNStatusCategory.PNBadRequestCategory + + if response.code == 599: + status_category = PNStatusCategory.PNTimeoutCategory + + future.set_exception(PubNubTornadoException( + result=data, + status=create_status_response(status_category, data, response_info, + PubNubException( + errormsg=data, + pn_error=err, + status_code=response.code, + )) + )) + else: + future.set_result(TornadoEnvelope( + result=create_response(data), + status=create_status_response( + PNStatusCategory.PNAcknowledgmentCategory, + data, + response_info, + None) + )) self.http.fetch( request=request, - callback=key_callback + callback=response_callback ) - return key_future + return future class TornadoPublishSequenceManager(PublishSequenceManager): @@ -307,8 +248,9 @@ def __init__(self, pubnub_instance): self._message_queue = Queue() self._consumer_event = Event() self._subscription_lock = Semaphore(1) - self._current_request_key_object = None + # self._current_request_key_object = None self._heartbeat_periodic_callback = None + self._cancellation_event = None super(TornadoSubscriptionManager, self).__init__(pubnub_instance) def _set_consumer_event(self): @@ -332,40 +274,78 @@ def reconnect(self): @tornado.gen.coroutine def _start_subscribe_loop(self): - self._stop_subscribe_loop() - yield self._subscription_lock.acquire() - cancellation_event = Event() + # - gotResultEvent + # - resubscribeEvent + # - cancelEvent + try: + combined_channels = self._subscription_state.prepare_channel_list(True) + print(">>> Subscribing with %s" % combined_channels) + self._stop_subscribe_loop() + print(">>> locking...") + yield self._subscription_lock.acquire() + print(">>> LOCKED") + self._cancellation_event = Event() - combined_channels = self._subscription_state.prepare_channel_list(True) - combined_groups = self._subscription_state.prepare_channel_group_list(True) + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) - if len(combined_channels) == 0 and len(combined_groups) == 0: - return + if len(combined_channels) == 0 and len(combined_groups) == 0: + return - try: - key_object, subscribe = yield Subscribe(self._pubnub) \ + envelope_future = Subscribe(self._pubnub) \ .channels(combined_channels).channel_groups(combined_groups) \ .timetoken(self._timetoken).region(self._region) \ .filter_expression(self._pubnub.config.filter_expression) \ - .cancellation_event(cancellation_event) \ - .future(intermediate_key_future=True) - - self._current_request_key_object = key_object - envelope = yield subscribe + .cancellation_event(self._cancellation_event) \ + .future() - self._handle_endpoint_call(envelope.result, envelope.status) - self._start_subscribe_loop() + wi = tornado.gen.WaitIterator( + envelope_future, + self._cancellation_event.wait()) + + while not wi.done(): + try: + result = yield wi.next() + print("result is %s" % result) + except GeneratorExit as e: + print("generator exit inner") + # raise StopIteration + except Exception as e: + print("Exception!!! {}".format(e)) + else: + if wi.current_future == envelope_future: + envelope = result + elif wi.current_future == self._cancellation_event.wait(): + print("Call Cancelled {}".format(result)) + break + + self._handle_endpoint_call(envelope.result, envelope.status) + self._start_subscribe_loop() except PubNubTornadoException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: self._pubnub.ioloop.add_callback(self._start_subscribe_loop) else: self._listener_manager.announce_status(e.status) + # except GeneratorExit as e: + # print("generator exit outer") + # return + except Exception as e: + logger.error(e) + raise finally: - cancellation_event.set() + print("Finally clean up here") + print("Finally set") + self._cancellation_event.set() + yield tornado.gen.moment + print("Finally reset") + self._cancellation_event = None self._subscription_lock.release() + print(">>> RELEASED") def _stop_subscribe_loop(self): - self._pubnub.http.reset_request(self._current_request_key_object) + if self._cancellation_event is not None: + print("Cancelling %s" % self._cancellation_event) + self._cancellation_event.set() def _stop_heartbeat_timer(self): if self._heartbeat_periodic_callback is not None: diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml new file mode 100644 index 00000000..dce0193d --- /dev/null +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -0,0 +1,189 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:42:16 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + response: + body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:42:16 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + response: + body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:42:16 GMT'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": + {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": + {"uuids": ["test-here-now-uuid"], "occupancy": 1}}, "total_channels": 2, "total_occupancy": + 2}, "service": "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:42:23 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['279'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:42:24 GMT'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid +version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml new file mode 100644 index 00000000..783ba762 --- /dev/null +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -0,0 +1,156 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} + headers: + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:34:52 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} + headers: + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:34:53 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&uuid=test-here-now-uuid&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": + {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": + {"uuids": ["test-here-now-uuid"], "occupancy": 1}}, "total_channels": 2, "total_occupancy": + 2}, "service": "Presence"}'} + headers: + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Length + - ['279'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:34:58 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Age + - ['0'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:34:59 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Age + - ['0'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid +version: 1 diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index b3b3df52..d073e717 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -6,7 +6,7 @@ from tornado import gen from tornado.testing import AsyncHTTPTestCase, AsyncTestCase -from pubnub.pubnub_tornado import PubNubTornado +from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep @@ -46,22 +46,22 @@ def test_here_now_single_channel(self): self.pubnub.stop() self.stop() - # @use_cassette_and_stub_time_sleep( - # 'tests/integrational/fixtures/tornado/here_now/multiple.yaml', - # filter_query_parameters=['uuid', 'tt', 'tr']) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/here_now/multiple.yaml', + filter_query_parameters=['uuid', 'tt', 'tr']) @tornado.testing.gen_test(timeout=120) def test_here_now_multiple_channels(self): ch1 = 'test-here-now-channel1' ch2 = 'test-here-now-channel2' self.pubnub.config.uuid = 'test-here-now-uuid' - print("connecting to the first...") + # print("connecting to the first...") yield connect_to_channel(self.pubnub, ch1) - print("...connected to the first") + # print("...connected to the first") yield gen.sleep(1) - print("connecting to the second...") + # print("connecting to the second...") self.pubnub.subscribe().channels(ch2).execute() - print("...connected to the second") - yield gen.sleep(15) + # print("...connected to the second") + yield gen.sleep(5) env = yield self.pubnub.here_now() \ .channels([ch1, ch2]) \ .future() @@ -90,7 +90,12 @@ def test_here_now_global(self): ch2 = 'test-here-now-channel2' self.pubnub.config.uuid = 'test-here-now-uuid' - yield connect_to_channel(self.pubnub, [ch1, ch2]) + callback_messages = SubscribeListener() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels(ch1).execute() + yield callback_messages.wait_for_connect() + + self.pubnub.subscribe().channels(ch2).execute() yield gen.sleep(6) env = yield self.pubnub.here_now().future() diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index a2d1e1d5..5f9eeeeb 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -5,7 +5,6 @@ from tornado.testing import AsyncTestCase from tornado import gen from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener -from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep @@ -25,9 +24,9 @@ def setUp(self): self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - @use_cassette_and_stub_time_sleep( - 'tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml', - filter_query_parameters=['uuid', 'seqn']) + # @use_cassette_and_stub_time_sleep( + # 'tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml', + # filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=300) def test_subscribe_unsubscribe(self): ch = "subscribe-tornado-ch" @@ -239,3 +238,56 @@ def test_group_join_leave(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + + @tornado.testing.gen_test(timeout=30) + def test_subscribe_step_by_step(self): + """ + Test logic: + subscribe ch1 + sleep 1 + subscribe ch2 + subscribe ch3 + sleep 4 + unsubscribe ch1 + subscribe cg1 + """ + ch1 = 'test-here-now-channel1' + ch2 = 'test-here-now-channel2' + ch3 = 'test-here-now-channel3' + self.pubnub.config.uuid = 'test-here-now-uuid' + callback_messages = SubscribeListener() + self.pubnub.add_listener(callback_messages) + print("connecting to the first...") + self.pubnub.subscribe().channels(ch1).execute() + yield callback_messages.wait_for_connect() + print("...connected to the first") + yield gen.sleep(1) + print("connecting to the second...") + self.pubnub.subscribe().channels(ch2).execute() + self.pubnub.subscribe().channels(ch3).execute() + self.pubnub.subscribe().channels(ch3).execute() + self.pubnub.subscribe().channels(ch2).execute() + print("...connected to the second") + yield gen.sleep(5) + env = yield self.pubnub.here_now() \ + .channels([ch1, ch2]) \ + .future() + + assert env.result.total_channels == 2 + assert env.result.total_occupancy >= 1 + + channels = env.result.channels + + assert len(channels) == 2 + assert channels[0].occupancy >= 1 + assert channels[0].occupants[0].uuid == self.pubnub.uuid + assert channels[1].occupancy >= 1 + assert channels[1].occupants[0].uuid == self.pubnub.uuid + + self.pubnub.unsubscribe().channels([ch1, ch2]).execute() + yield callback_messages.wait_for_disconnect() + + self.pubnub.unsubscribe().channels(ch3).execute() + + self.pubnub.stop() + self.stop() From 66abcc0ea10c71a60c553ed30a15e8e7fe2ffef0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 04:53:56 -0700 Subject: [PATCH 287/468] Asyncio 599 handling fix --- pubnub/pubnub_asyncio.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 2f081521..032d954c 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -1,6 +1,8 @@ import logging import json import asyncio +from json import JSONDecodeError + import aiohttp import math @@ -136,6 +138,11 @@ def request_future(self, intermediate_key_future, options_func, create_response, if body is not None and len(body) > 0: try: data = json.loads(body) + except JSONDecodeError: + if response.status == 599 and len(body) > 0: + data = body + else: + raise except TypeError: try: data = json.loads(body.decode("utf-8")) @@ -166,9 +173,6 @@ def request_future(self, intermediate_key_future, options_func, create_response, if response.status == 400: status_category = PNStatusCategory.PNBadRequestCategory - if response.status == 599: - status_category = PNStatusCategory.PNTimeoutCategory - raise PubNubAsyncioException( result=data, status=create_status_response(status_category, data, response_info, From 85f4398d379e1e0c0cf40629b462264ad23ee844 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 05:00:05 -0700 Subject: [PATCH 288/468] Add Tornado step by step subscribe test --- .../subscribe/subscribe_tep_by_step.yaml | 156 ++++++++++++++++++ tests/integrational/tornado/test_subscribe.py | 13 +- 2 files changed, 159 insertions(+), 10 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml new file mode 100644 index 00000000..2f0ca094 --- /dev/null +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -0,0 +1,156 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14717806990508559","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:58:19 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + response: + body: {string: '{"t":{"t":"14717807001063591","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:58:20 GMT'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": + {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": + {"uuids": ["test-here-now-uuid"], "occupancy": 1}}, "total_channels": 2, "total_occupancy": + 2}, "service": "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['279'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:58:25 GMT'] + - !!python/tuple + - Server + - [Pubnub Presence] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 11:58:25 GMT'] + - !!python/tuple + - Server + - [Pubnub Presence] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 5f9eeeeb..89b9d7f5 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -239,18 +239,11 @@ def test_group_join_leave(self): envelope = yield self.pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=30) def test_subscribe_step_by_step(self): - """ - Test logic: - subscribe ch1 - sleep 1 - subscribe ch2 - subscribe ch3 - sleep 4 - unsubscribe ch1 - subscribe cg1 - """ ch1 = 'test-here-now-channel1' ch2 = 'test-here-now-channel2' ch3 = 'test-here-now-channel3' From 27519d52ad042cc65439c4441e8bd6ae9461a385 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 05:06:20 -0700 Subject: [PATCH 289/468] Remove extra vcr patches --- tests/integrational/vcr_helper.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index 92a10395..021631a1 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -4,25 +4,11 @@ import six import vcr -from vcr.stubs.pubnub_tornado_stubs import vcr_fetch_impl -import pubnub.pubnub_tornado from tests.helper import url_decode -_SimpleAsyncHTTPClient_fetch_impl = pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient.fetch_impl - - -class PatchWrapper(object): - def wrap_cassette(self, cassette): - return vcr_fetch_impl( - cassette, _SimpleAsyncHTTPClient_fetch_impl - ) - - pn_vcr = vcr.VCR( - cassette_library_dir=os.path.dirname(os.path.dirname((os.path.dirname(os.path.abspath(__file__))))), - custom_patches=((pubnub.pubnub_tornado.PubNubTornadoSimpleAsyncHTTPClient, - 'fetch_impl', PatchWrapper()),) + cassette_library_dir=os.path.dirname(os.path.dirname((os.path.dirname(os.path.abspath(__file__))))) ) From bccb9a7fa0214f1332ae224e695b3d787e92fd4a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 05:30:15 -0700 Subject: [PATCH 290/468] Add cassettes for tornado/where_now --- .../tornado/where_now/multiple_channels.yaml | 187 ++++++++++++++++++ .../tornado/where_now/single_channel.yaml | 121 ++++++++++++ tests/integrational/tornado/test_where_now.py | 27 ++- 3 files changed, 326 insertions(+), 9 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml create mode 100644 tests/integrational/fixtures/tornado/where_now/single_channel.yaml diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml new file mode 100644 index 00000000..6a63913d --- /dev/null +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -0,0 +1,187 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:24:17 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=0 + response: + body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:24:17 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=0 + response: + body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:24:17 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", + "where-now-tornado-ch1"]}, "service": "Presence"}'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['132'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:24:22 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub Presence] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:24:23 GMT'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Server + - [Pubnub Presence] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml new file mode 100644 index 00000000..1d74a1bf --- /dev/null +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -0,0 +1,121 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Content-Length + - ['44'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:33:12 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid&tt=0 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, + "service": "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Length + - ['106'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:33:23 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Age + - ['0'] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Date + - ['Sun, 21 Aug 2016 12:33:23 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid +version: 1 diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py index 969d9ac4..6193b1d6 100644 --- a/tests/integrational/tornado/test_where_now.py +++ b/tests/integrational/tornado/test_where_now.py @@ -2,7 +2,7 @@ from tornado import gen from tornado.testing import AsyncHTTPTestCase, AsyncTestCase -from pubnub.pubnub_tornado import PubNubTornado +from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel @@ -14,13 +14,13 @@ def setUp(self): super(TestPubNubAsyncWhereNow, self).setUp() self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - # @use_cassette_and_stub_time_sleep( - # 'tests/integrational/fixtures/tornado/where_now/single_channel.yaml', - # filter_query_parameters=['uuid', 'seqn']) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/where_now/single_channel.yaml', + filter_query_parameters=['uuid']) @tornado.testing.gen_test(timeout=15) def test_where_now_single_channel(self): ch = "where-now-tornado-ch" - uuid = helper.gen_channel("wherenow-asyncio-uuid") + uuid = "where-now-tornado-uuid" self.pubnub.config.uuid = uuid yield connect_to_channel(self.pubnub, ch) @@ -38,15 +38,24 @@ def test_where_now_single_channel(self): self.pubnub.stop() self.stop() + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml', + filter_query_parameters=['uuid']) @tornado.testing.gen_test(timeout=15) def test_multiple_channels(self): - ch1 = helper.gen_channel("here-now") - ch2 = helper.gen_channel("here-now") - uuid = helper.gen_channel("wherenow-asyncio-uuid") + ch1 = "where-now-tornado-ch1" + ch2 = "where-now-tornado-ch2" + uuid = "where-now-tornado-uuid" self.pubnub.config.uuid = uuid - yield connect_to_channel(self.pubnub, [ch1, ch2]) + callback_messages = SubscribeListener() + self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels(ch1).execute() + yield callback_messages.wait_for_connect() + + self.pubnub.subscribe().channels(ch2).execute() yield gen.sleep(5) + env = yield self.pubnub.where_now() \ .uuid(uuid) \ .future() From 83bd82f65d7beb5fe7360569db158c028a713550 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 08:45:19 -0700 Subject: [PATCH 291/468] Remove intermediate_key request param from Asyncio --- pubnub/pubnub_asyncio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 032d954c..32757a9c 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -78,7 +78,7 @@ def request_deferred(self, *args): raise NotImplementedError @asyncio.coroutine - def request_future(self, intermediate_key_future, options_func, create_response, + def request_future(self, options_func, create_response, create_status_response, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) From b474757d1f2acebb98f4d04276ee81513bbbfab9 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 08:59:10 -0700 Subject: [PATCH 292/468] Fix native sync tests --- .../channel_groups/single_channel.yaml | 26 +++++++++---------- .../native_sync/test_channel_groups.py | 3 ++- .../integrational/native_sync/test_history.py | 3 ++- .../integrational/native_sync/test_publish.py | 12 ++++++--- tests/integrational/native_sync/test_ssl.py | 3 ++- tests/integrational/native_sync/test_state.py | 3 ++- 6 files changed, 29 insertions(+), 21 deletions(-) diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 6d8cc0a3..8ca509df 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.0 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:14 GMT'] + Date: ['Sun, 21 Aug 2016 15:58:18 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,10 +31,10 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], - "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": + body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], + "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} headers: Accept-Ranges: [bytes] @@ -43,9 +43,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['150'] + Content-Length: ['154'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:17 GMT'] + Date: ['Sun, 21 Aug 2016 15:58:20 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:17 GMT'] + Date: ['Sun, 21 Aug 2016 15:58:20 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,9 +80,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.0] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0 response: - body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, + body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} headers: Accept-Ranges: [bytes] @@ -91,9 +91,9 @@ interactions: Age: ['0'] Cache-Control: [no-cache] Connection: [keep-alive] - Content-Length: ['126'] + Content-Length: ['128'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:19 GMT'] + Date: ['Sun, 21 Aug 2016 15:58:22 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index b08ec1c1..2eac2141 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -6,7 +6,8 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep +from tests.helper import pnconf_copy +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep pubnub.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 2416254c..f4b3bd8a 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -6,7 +6,8 @@ from pubnub.models.consumer.history import PNHistoryResult from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep, pnconf_enc_copy +from tests.helper import pnconf_copy, pnconf_enc_copy +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep pubnub.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index 0987d7e4..57f8896d 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -6,7 +6,8 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub -from tests.helper import pnconf, pnconf_enc, pn_vcr +from tests.helper import pnconf, pnconf_enc +from tests.integrational.vcr_helper import pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -40,8 +41,10 @@ def test_publish_list_get(self): except PubNubException as e: self.fail(e) - @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml', - filter_query_parameters=['uuid'], match_on=['publish_object']) + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']) def test_publish_object_get(self): try: env = PubNub(pnconf).publish() \ @@ -141,7 +144,8 @@ def test_publish_list_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'scheme', 'host', 'port', 'path', 'query', 'object_in_body']) def test_publish_object_post(self): try: env = PubNub(pnconf).publish() \ diff --git a/tests/integrational/native_sync/test_ssl.py b/tests/integrational/native_sync/test_ssl.py index ad6d5f00..db0f4f85 100644 --- a/tests/integrational/native_sync/test_ssl.py +++ b/tests/integrational/native_sync/test_ssl.py @@ -5,7 +5,8 @@ from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub -from tests.helper import pn_vcr, pnconf_copy +from tests.helper import pnconf_copy +from tests.integrational.vcr_helper import pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py index fd328273..51ffa3a7 100644 --- a/tests/integrational/native_sync/test_state.py +++ b/tests/integrational/native_sync/test_state.py @@ -4,7 +4,8 @@ from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, pn_vcr +from tests.helper import pnconf_copy +from tests.integrational.vcr_helper import pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) From 18e0b5a9a2efb88de3311eb47b08963816b2b16c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 21 Aug 2016 09:10:47 -0700 Subject: [PATCH 293/468] Fix native threads tests --- tests/integrational/native_threads/test_channel_groups.py | 3 ++- tests/integrational/native_threads/test_publish.py | 2 +- tests/integrational/native_threads/test_state.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/integrational/native_threads/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py index 1cfc2295..2308ebb3 100644 --- a/tests/integrational/native_threads/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -7,7 +7,8 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, use_cassette_and_stub_time_sleep +from tests.helper import pnconf_copy +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep pubnub.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native_threads/test_publish.py b/tests/integrational/native_threads/test_publish.py index c8600c7a..8767b51c 100644 --- a/tests/integrational/native_threads/test_publish.py +++ b/tests/integrational/native_threads/test_publish.py @@ -7,7 +7,7 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub -from tests.helper import pnconf, pnconf_enc, pn_vcr +from tests.helper import pnconf, pnconf_enc pubnub.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/native_threads/test_state.py b/tests/integrational/native_threads/test_state.py index 42fb333a..b721ae5d 100644 --- a/tests/integrational/native_threads/test_state.py +++ b/tests/integrational/native_threads/test_state.py @@ -5,7 +5,8 @@ from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, pn_vcr +from tests.helper import pnconf_copy +from tests.integrational.vcr_helper import pn_vcr pubnub.set_stream_logger('pubnub', logging.DEBUG) From 66f4fecb33f306aedd08b02d585fdee17981de65 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 03:57:38 -0700 Subject: [PATCH 294/468] Test fixes --- pubnub/pubnub_tornado.py | 1 - setup.cfg | 2 +- tests/integrational/README.md | 5 +++ .../asyncio/test_channel_groups.py | 3 +- tests/integrational/asyncio/test_here_now.py | 3 +- tests/integrational/asyncio/test_subscribe.py | 3 +- tests/integrational/asyncio/test_where_now.py | 3 +- .../native_sync/test_channel_groups.py | 15 +++---- .../integrational/native_sync/test_history.py | 14 +++---- .../integrational/native_sync/test_publish.py | 2 +- tests/integrational/native_sync/test_ssl.py | 2 +- tests/integrational/native_sync/test_state.py | 4 +- .../native_threads/test_channel_groups.py | 12 +++--- .../native_threads/test_state.py | 4 +- .../tornado/test_channel_groups.py | 4 +- tests/integrational/tornado/test_here_now.py | 6 +-- tests/integrational/tornado/test_publish.py | 5 ++- tests/integrational/tornado/test_ssl.py | 1 + tests/integrational/tornado/test_state.py | 6 +-- tests/integrational/tornado/test_subscribe.py | 9 ++-- tests/integrational/tornado/test_where_now.py | 3 +- .../tornado/vcr_tornado_decorator.py | 38 +++++++++++++++++ tests/integrational/vcr_asyncio_sleeper.py | 28 +++++++++++++ tests/integrational/vcr_helper.py | 42 ++++--------------- 24 files changed, 132 insertions(+), 83 deletions(-) create mode 100644 tests/integrational/README.md create mode 100644 tests/integrational/tornado/vcr_tornado_decorator.py create mode 100644 tests/integrational/vcr_asyncio_sleeper.py diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index e6748658..72e3cd5a 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -13,7 +13,6 @@ from tornado.concurrent import Future from tornado.ioloop import PeriodicCallback from tornado.locks import Event, Semaphore, Lock -from tornado.log import gen_log from tornado.queues import Queue from tornado.simple_httpclient import SimpleAsyncHTTPClient diff --git a/setup.cfg b/setup.cfg index 8809d0b6..51549a47 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,3 @@ -[pytest] +[tool:pytest] norecursedirs = benchmarks diff --git a/tests/integrational/README.md b/tests/integrational/README.md new file mode 100644 index 00000000..9c1c5c96 --- /dev/null +++ b/tests/integrational/README.md @@ -0,0 +1,5 @@ +## VCR + +### Matchers +Default VCR.py matchers are: 'method', 'scheme', 'host', 'port', 'path', 'query' +PubNub custom VCR.py matchers are defined inside vcr_helper.py \ No newline at end of file diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index fc68223e..ba5d32a3 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -5,7 +5,8 @@ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub_asyncio import PubNubAsyncio from tests.helper import pnconf, pnconf_copy -from tests.integrational.vcr_helper import get_sleeper, pn_vcr +from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_helper import pn_vcr @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index ca8ad54d..b334d049 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -3,7 +3,8 @@ from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener from tests.helper import pnconf_sub_copy -from tests.integrational.vcr_helper import get_sleeper, pn_vcr +from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_helper import pn_vcr @get_sleeper('tests/integrational/fixtures/asyncio/here_now/single_channel.yaml') diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index d23ef600..0c43b906 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -6,7 +6,8 @@ from pubnub.models.consumer.pubsub import PNMessageResult from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy -from tests.integrational.vcr_helper import pn_vcr, get_sleeper +from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index d62fae03..542ccf0b 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -3,7 +3,8 @@ from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener from tests.helper import pnconf_sub_copy -from tests.integrational.vcr_helper import pn_vcr, get_sleeper +from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_helper import pn_vcr @get_sleeper('tests/integrational/fixtures/asyncio/where_now/single_channel.yaml') diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 2eac2141..9f88fb49 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -1,20 +1,21 @@ -import unittest import logging -import pubnub import time +import unittest +import pubnub from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub from tests.helper import pnconf_copy -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep_native pubnub.set_stream_logger('pubnub', logging.DEBUG) class TestPubNubChannelGroups(unittest.TestCase): - @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', - filter_query_parameters=['uuid']) + @use_cassette_and_stub_time_sleep_native( + 'tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', + filter_query_parameters=['uuid']) def test_single_channel(self): ch = "channel-groups-native-ch" gr = "channel-groups-native-cg" @@ -57,7 +58,7 @@ def test_single_channel(self): assert isinstance(envelope.result, PNChannelGroupsListResult) assert len(envelope.result.channels) == 0 - @use_cassette_and_stub_time_sleep( + @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml', filter_query_parameters=['uuid']) def test_add_remove_multiple_channels(self): @@ -104,7 +105,7 @@ def test_add_remove_multiple_channels(self): assert isinstance(envelope.result, PNChannelGroupsListResult) assert len(envelope.result.channels) == 0 - @use_cassette_and_stub_time_sleep( + @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml', filter_query_parameters=['uuid']) def test_add_channel_remove_group(self): diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index f4b3bd8a..60bde711 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -1,13 +1,13 @@ -import unittest import logging import time -import pubnub +import unittest +import pubnub from pubnub.models.consumer.history import PNHistoryResult from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub from tests.helper import pnconf_copy, pnconf_enc_copy -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep_native pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -15,8 +15,8 @@ class TestPubNubState(unittest.TestCase): - @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/history/basic.yaml', - filter_query_parameters=['uuid']) + @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/basic.yaml', + filter_query_parameters=['uuid']) def test_basic(self): ch = "history-native-sync-ch" pubnub = PubNub(pnconf_copy()) @@ -42,8 +42,8 @@ def test_basic(self): assert envelope.result.messages[3].entry == 'hey-3' assert envelope.result.messages[4].entry == 'hey-4' - @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_sync/history/encoded.yaml', - filter_query_parameters=['uuid']) + @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/encoded.yaml', + filter_query_parameters=['uuid']) def test_encrypted(self): ch = "history-native-sync-ch" pubnub = PubNub(pnconf_enc_copy()) diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index 57f8896d..6b7ea344 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -1,7 +1,7 @@ import logging import unittest -import pubnub +import pubnub from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration diff --git a/tests/integrational/native_sync/test_ssl.py b/tests/integrational/native_sync/test_ssl.py index db0f4f85..2b05ed3b 100644 --- a/tests/integrational/native_sync/test_ssl.py +++ b/tests/integrational/native_sync/test_ssl.py @@ -1,7 +1,7 @@ import logging import unittest -import pubnub +import pubnub from pubnub.exceptions import PubNubException from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py index 51ffa3a7..b5d8eedb 100644 --- a/tests/integrational/native_sync/test_state.py +++ b/tests/integrational/native_sync/test_state.py @@ -1,7 +1,7 @@ -import unittest import logging -import pubnub +import unittest +import pubnub from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub from tests.helper import pnconf_copy diff --git a/tests/integrational/native_threads/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py index 2308ebb3..1b1605a3 100644 --- a/tests/integrational/native_threads/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -1,14 +1,14 @@ +import logging import threading import time import unittest -import logging -import pubnub +import pubnub from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub import PubNub from tests.helper import pnconf_copy -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep_native pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -22,7 +22,7 @@ def callback(self, response, status): self.status = status self.event.set() - @use_cassette_and_stub_time_sleep('tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml', + @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml', filter_query_parameters=['uuid']) def test_single_channel(self): ch = "channel-groups-unit-ch" @@ -75,7 +75,7 @@ def test_single_channel(self): assert len(self.response.channels) == 0 self.event.clear() - @use_cassette_and_stub_time_sleep( + @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml', filter_query_parameters=['uuid']) def test_add_remove_multiple_channels(self): @@ -131,7 +131,7 @@ def test_add_remove_multiple_channels(self): assert len(self.response.channels) == 0 self.event.clear() - @use_cassette_and_stub_time_sleep( + @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml', filter_query_parameters=['uuid']) def test_add_channel_remove_group(self): diff --git a/tests/integrational/native_threads/test_state.py b/tests/integrational/native_threads/test_state.py index b721ae5d..f09dc6ce 100644 --- a/tests/integrational/native_threads/test_state.py +++ b/tests/integrational/native_threads/test_state.py @@ -1,8 +1,8 @@ -import unittest import logging -import pubnub import threading +import unittest +import pubnub from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub import PubNub from tests.helper import pnconf_copy diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py index fa0c143a..a6974850 100644 --- a/tests/integrational/tornado/test_channel_groups.py +++ b/tests/integrational/tornado/test_channel_groups.py @@ -1,12 +1,12 @@ import tornado -from tornado.testing import AsyncHTTPTestCase, AsyncTestCase from tornado import gen +from tornado.testing import AsyncHTTPTestCase, AsyncTestCase from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub_tornado import PubNubTornado from tests.helper import pnconf -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep class TestChannelGroups(AsyncTestCase): diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index d073e717..d4bd3ff9 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -1,15 +1,15 @@ import logging + import tornado import tornado.gen -import pubnub as pn - from tornado import gen from tornado.testing import AsyncHTTPTestCase, AsyncTestCase +import pubnub as pn from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep pn.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 3cf1f741..5bfcfd05 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -1,9 +1,10 @@ import logging -import tornado -import pubnub as pn +import tornado from tornado.concurrent import Future from tornado.testing import AsyncTestCase + +import pubnub as pn from pubnub.exceptions import PubNubException from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pubsub import PNPublishResult diff --git a/tests/integrational/tornado/test_ssl.py b/tests/integrational/tornado/test_ssl.py index 3902833f..d62381a3 100644 --- a/tests/integrational/tornado/test_ssl.py +++ b/tests/integrational/tornado/test_ssl.py @@ -14,6 +14,7 @@ class TestPubNubAsyncPublish(AsyncTestCase): + # TODO: add vcr @tornado.testing.gen_test def test_publish_ssl(self): pubnub = PubNubTornado(pnconf_ssl_copy(), custom_ioloop=self.io_loop) diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index 382a3714..f3c52350 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -1,11 +1,9 @@ import tornado from tornado.testing import AsyncHTTPTestCase, AsyncTestCase + from pubnub.pubnub_tornado import PubNubTornado from tests.helper import pnconf_copy - -# TODO: test for 'No valid channels specified' -# TODO: test for CG state getter (after implementation of CG methods) -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep class TestPubNubState(AsyncTestCase): diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 89b9d7f5..9e616765 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -1,12 +1,13 @@ import logging -import tornado -import pubnub as pn -from tornado.testing import AsyncTestCase +import tornado from tornado import gen +from tornado.testing import AsyncTestCase + +import pubnub as pn from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests.helper import pnconf_sub_copy -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep pn.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py index 6193b1d6..e2b86884 100644 --- a/tests/integrational/tornado/test_where_now.py +++ b/tests/integrational/tornado/test_where_now.py @@ -3,10 +3,9 @@ from tornado.testing import AsyncHTTPTestCase, AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener -from tests import helper from tests.helper import pnconf_sub_copy from tests.integrational.tornado.tornado_helper import connect_to_channel, disconnect_from_channel -from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep class TestPubNubAsyncWhereNow(AsyncTestCase): diff --git a/tests/integrational/tornado/vcr_tornado_decorator.py b/tests/integrational/tornado/vcr_tornado_decorator.py new file mode 100644 index 00000000..4deb9211 --- /dev/null +++ b/tests/integrational/tornado/vcr_tornado_decorator.py @@ -0,0 +1,38 @@ +import six + +from tests.integrational.vcr_helper import pn_vcr + +try: + from mock import patch +except ImportError: + from unittest.mock import patch + + +def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): + context = pn_vcr.use_cassette(cassette_name, **kwargs) + cs = context.cls(path=cassette_name).load(path=cassette_name) + + import tornado.gen + + @tornado.gen.coroutine + def returner(): + return + + def _inner(f): + @patch('tornado.gen.sleep', return_value=returner()) + @six.wraps(f) + def stubbed(*args, **kwargs): + with context as cassette: + largs = list(args) + # 1 - index + largs.pop(1) + return f(*largs, **kwargs) + + @six.wraps(f) + def original(*args): + with context as cassette: + return f(*args) + + return stubbed if len(cs) > 0 else original + + return _inner diff --git a/tests/integrational/vcr_asyncio_sleeper.py b/tests/integrational/vcr_asyncio_sleeper.py new file mode 100644 index 00000000..7c2517fa --- /dev/null +++ b/tests/integrational/vcr_asyncio_sleeper.py @@ -0,0 +1,28 @@ +""" +Placed into the separate file to avoid python <3.4 tests using it +""" +import six + +from tests.integrational.vcr_helper import pn_vcr + + +def get_sleeper(cassette_name): + """ + Loads cassette just to check if it is in record or playback mode + """ + context = pn_vcr.use_cassette(cassette_name) + cs = context.cls(path=cassette_name).load(path=cassette_name) + + import asyncio + + @asyncio.coroutine + def fake_sleeper(v): + yield from asyncio.sleep(0) + + def decorate(f): + @six.wraps(f) + def call(*args, event_loop=None): + yield from f(*args, sleeper=(fake_sleeper if (len(cs) > 0) else asyncio.sleep), event_loop=event_loop) + + return call + return decorate \ No newline at end of file diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index 021631a1..a2dbe87f 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -1,14 +1,18 @@ import json import os -from unittest.mock import patch - import six import vcr +try: + from mock import patch +except ImportError: + from unittest.mock import patch from tests.helper import url_decode +vcr_dir = os.path.dirname(os.path.dirname((os.path.dirname(os.path.abspath(__file__))))) +print(vcr_dir) pn_vcr = vcr.VCR( - cassette_library_dir=os.path.dirname(os.path.dirname((os.path.dirname(os.path.abspath(__file__))))) + cassette_library_dir=vcr_dir ) @@ -183,26 +187,18 @@ def check_the_difference_matcher(r1, r2): pn_vcr.register_matcher('string_list_in_query', string_list_in_query_matcher) -def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): +def use_cassette_and_stub_time_sleep_native(cassette_name, **kwargs): context = pn_vcr.use_cassette(cassette_name, **kwargs) cs = context.cls(path=cassette_name).load(path=cassette_name) - import tornado.gen - - @tornado.gen.coroutine - def returner(): - return - def _inner(f): @patch('time.sleep', return_value=None) - @patch('tornado.gen.sleep', return_value=returner()) @six.wraps(f) def stubbed(*args, **kwargs): with context as cassette: largs = list(args) # 1 - index largs.pop(1) - largs.pop(1) return f(*largs, **kwargs) @six.wraps(f) @@ -213,25 +209,3 @@ def original(*args): return stubbed if len(cs) > 0 else original return _inner - - -def get_sleeper(cassette_name): - """ - Loads cassette just to check if it is in record or playback mode - """ - context = pn_vcr.use_cassette(cassette_name) - cs = context.cls(path=cassette_name).load(path=cassette_name) - - import asyncio - - @asyncio.coroutine - def fake_sleeper(v): - yield from asyncio.sleep(0) - - def decorate(f): - @six.wraps(f) - def call(*args, event_loop=None): - yield from f(*args, sleeper=(fake_sleeper if (len(cs) > 0) else asyncio.sleep), event_loop=event_loop) - - return call - return decorate From c8855896ee0a4bec8aaabd3f1a4f901562cafe35 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 04:25:00 -0700 Subject: [PATCH 295/468] Fix test sleepers --- tests/integrational/tornado/vcr_tornado_decorator.py | 3 ++- tests/integrational/vcr_asyncio_sleeper.py | 3 ++- tests/integrational/vcr_helper.py | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/integrational/tornado/vcr_tornado_decorator.py b/tests/integrational/tornado/vcr_tornado_decorator.py index 4deb9211..77811945 100644 --- a/tests/integrational/tornado/vcr_tornado_decorator.py +++ b/tests/integrational/tornado/vcr_tornado_decorator.py @@ -10,7 +10,8 @@ def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): context = pn_vcr.use_cassette(cassette_name, **kwargs) - cs = context.cls(path=cassette_name).load(path=cassette_name) + full_path = "{}/{}".format(pn_vcr.cassette_library_dir, cassette_name) + cs = context.cls(path=full_path).load(path=full_path) import tornado.gen diff --git a/tests/integrational/vcr_asyncio_sleeper.py b/tests/integrational/vcr_asyncio_sleeper.py index 7c2517fa..0d4dd085 100644 --- a/tests/integrational/vcr_asyncio_sleeper.py +++ b/tests/integrational/vcr_asyncio_sleeper.py @@ -11,7 +11,8 @@ def get_sleeper(cassette_name): Loads cassette just to check if it is in record or playback mode """ context = pn_vcr.use_cassette(cassette_name) - cs = context.cls(path=cassette_name).load(path=cassette_name) + full_path = "{}/{}".format(pn_vcr.cassette_library_dir, cassette_name) + cs = context.cls(path=full_path).load(path=full_path) import asyncio diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index a2dbe87f..ed7dfae2 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -10,7 +10,7 @@ from tests.helper import url_decode vcr_dir = os.path.dirname(os.path.dirname((os.path.dirname(os.path.abspath(__file__))))) -print(vcr_dir) + pn_vcr = vcr.VCR( cassette_library_dir=vcr_dir ) @@ -189,7 +189,8 @@ def check_the_difference_matcher(r1, r2): def use_cassette_and_stub_time_sleep_native(cassette_name, **kwargs): context = pn_vcr.use_cassette(cassette_name, **kwargs) - cs = context.cls(path=cassette_name).load(path=cassette_name) + full_path = "{}/{}".format(pn_vcr.cassette_library_dir, cassette_name) + cs = context.cls(path=full_path).load(path=full_path) def _inner(f): @patch('time.sleep', return_value=None) From 8dbb99b41a7563b6d9ab452235220f62a9df1193 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 05:20:44 -0700 Subject: [PATCH 296/468] Add hacked vcr dependencies --- .gitignore | 1 + requirements-dev.txt | 3 +-- requirements26-dev.txt | 1 + requirements27-dev.txt | 1 + requirements33-dev.txt | 1 + requirements34-dev.txt | 3 ++- requirements35-dev.txt | 3 ++- 7 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e84d398a..06b38ad0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ __pycache__/ # Distribution / packaging .Python env/ +src/ build/ develop-eggs/ dist/ diff --git a/requirements-dev.txt b/requirements-dev.txt index 1655b5ca..95455bbb 100755 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,5 @@ pytest pytest-cov codecov -vcrpy pycrypto -pytest-benchmark \ No newline at end of file +pytest-benchmark diff --git a/requirements26-dev.txt b/requirements26-dev.txt index 14fe0d3e..e824a660 100644 --- a/requirements26-dev.txt +++ b/requirements26-dev.txt @@ -1 +1,2 @@ mock==2.0.0 +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py2.6.egg diff --git a/requirements27-dev.txt b/requirements27-dev.txt index f928fcea..7a69c64c 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,3 +1,4 @@ twisted tornado pyopenssl +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py2.7.egg diff --git a/requirements33-dev.txt b/requirements33-dev.txt index c3368dfa..02065620 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1 +1,2 @@ tornado +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.3.egg diff --git a/requirements34-dev.txt b/requirements34-dev.txt index c680ba33..563a6a19 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -1,3 +1,4 @@ pytest-asyncio tornado -aiohttp \ No newline at end of file +aiohttp +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.4.egg diff --git a/requirements35-dev.txt b/requirements35-dev.txt index c680ba33..af18a5c7 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -1,3 +1,4 @@ pytest-asyncio tornado -aiohttp \ No newline at end of file +aiohttp +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.5.egg From 6213a56e757ed05c3904ad5e829e2c2c714111db Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 05:21:09 -0700 Subject: [PATCH 297/468] Remove benchmarks --- tests/benchmarks/__init__.py | 0 .../tornado/test_bm_subscription.py | 69 ------------------- 2 files changed, 69 deletions(-) delete mode 100644 tests/benchmarks/__init__.py delete mode 100644 tests/benchmarks/tornado/test_bm_subscription.py diff --git a/tests/benchmarks/__init__.py b/tests/benchmarks/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/benchmarks/tornado/test_bm_subscription.py b/tests/benchmarks/tornado/test_bm_subscription.py deleted file mode 100644 index df682d79..00000000 --- a/tests/benchmarks/tornado/test_bm_subscription.py +++ /dev/null @@ -1,69 +0,0 @@ -import logging - -import tornado.gen -import tornado.locks -import tornado.ioloop - -import pubnub as pn - -from pubnub.callbacks import SubscribeCallback -from pubnub.pubnub_tornado import PubNubTornado -from tests.helper import pnconf - -io_loop = tornado.ioloop.IOLoop.instance() -connected = tornado.locks.Event() - -pn.set_stream_logger('pubnub', logging.DEBUG) - -ch = "ch-bench" -count = 10 - - -class SubscriptionBenchmarkListener(SubscribeCallback): - def __init__(self): - self.i = 0 - self.event = None - - def status(self, pubnub, status): - connected.set() - - def presence(self, pubnub, presence): - pass - - def message(self, pubnub, response): - print("message#%d" % self.i) - assert response.message == "hey-%d" % self.i - self.i += 1 - self.event.set() - - def set_event(self, event): - self.event = event - -pubnub = PubNubTornado(pnconf, custom_ioloop=io_loop) -callback = SubscriptionBenchmarkListener() -pubnub.add_listener(callback) -pubnub.subscribe().channels(ch).execute() -connected.wait() - - -@tornado.gen.coroutine -def publish(i): - yield pubnub.publish().channel(ch).message("hey-%d" % i).future() - - -@tornado.gen.coroutine -def cycle(): - event = tornado.locks.Event() - io_loop.add_callback(publish, callback.i) - callback.set_event(event) - yield event.wait() - - -def runner(): - io_loop.run_sync(cycle) - - -def test_subscription_benchmark(benchmark): - benchmark(runner) - pubnub.stop() - io_loop.stop() From 8c992d21a63fba733ae22380241e42c2db94557c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 06:26:58 -0700 Subject: [PATCH 298/468] Change JSONDecideError => ValueError in asyncio --- pubnub/pubnub_asyncio.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 32757a9c..94b41b27 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -1,7 +1,6 @@ import logging import json import asyncio -from json import JSONDecodeError import aiohttp import math @@ -138,7 +137,7 @@ def request_future(self, options_func, create_response, if body is not None and len(body) > 0: try: data = json.loads(body) - except JSONDecodeError: + except ValueError: if response.status == 599 and len(body) > 0: data = body else: From 6757a4a6c9496410c83f152688de8b5402cba777 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 06:29:10 -0700 Subject: [PATCH 299/468] Fix formatting --- pubnub/pubnub_asyncio.py | 5 +---- pubnub/pubnub_tornado.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 94b41b27..04cceaf3 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -1,14 +1,11 @@ import logging import json import asyncio - import aiohttp import math - -from asyncio import Event, Queue, Semaphore - import six +from asyncio import Event, Queue, Semaphore from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 72e3cd5a..d6e9cea0 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -1,13 +1,12 @@ -import functools import json import logging import time import datetime - import six import tornado.gen import tornado.httpclient import tornado.ioloop + from tornado import ioloop from tornado import stack_context from tornado.concurrent import Future From a9d3424688a6b01bedac364d5402b0638cbeb209 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 13:01:01 -0700 Subject: [PATCH 300/468] Fix Python2.6 compatibility formatting --- tests/integrational/vcr_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index ed7dfae2..e3ce33f6 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -189,7 +189,7 @@ def check_the_difference_matcher(r1, r2): def use_cassette_and_stub_time_sleep_native(cassette_name, **kwargs): context = pn_vcr.use_cassette(cassette_name, **kwargs) - full_path = "{}/{}".format(pn_vcr.cassette_library_dir, cassette_name) + full_path = "{0}/{1}".format(pn_vcr.cassette_library_dir, cassette_name) cs = context.cls(path=full_path).load(path=full_path) def _inner(f): From 8d7bba2620d81c64789cbdb1d8cffd185cb85040 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 23 Aug 2016 14:06:53 -0700 Subject: [PATCH 301/468] Fix pypy tests --- requirements-pypy-dev.txt | 3 ++- tests/integrational/tornado/test_ssl.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt index 716f2ab7..9530794f 100644 --- a/requirements-pypy-dev.txt +++ b/requirements-pypy-dev.txt @@ -1 +1,2 @@ -tornado \ No newline at end of file +tornado +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-pypy.egg diff --git a/tests/integrational/tornado/test_ssl.py b/tests/integrational/tornado/test_ssl.py index d62381a3..34e002c6 100644 --- a/tests/integrational/tornado/test_ssl.py +++ b/tests/integrational/tornado/test_ssl.py @@ -1,4 +1,6 @@ import logging +import pytest +import sys import tornado import pubnub as pn @@ -8,6 +10,11 @@ from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope from tests.helper import pnconf_ssl_copy +try: + import __pypy__ +except ImportError: + __pypy__ = None + pn.set_stream_logger('pubnub', logging.DEBUG) ch = "tornado-int-publish" @@ -15,8 +22,11 @@ class TestPubNubAsyncPublish(AsyncTestCase): # TODO: add vcr + @pytest.mark.skipif(__pypy__ is not None, + reason="TODO: configure SSL certificate to make test pass") @tornado.testing.gen_test def test_publish_ssl(self): + print(sys.version_info) pubnub = PubNubTornado(pnconf_ssl_copy(), custom_ioloop=self.io_loop) msg = "hey" pub = pubnub.publish().channel(ch).message(msg) From e14af833e1aabb46efbc9aac86c5bfb02ba0f1e2 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 24 Aug 2016 03:35:32 -0700 Subject: [PATCH 302/468] Add tornado heartbeat test cassette --- .../fixtures/tornado/heartbeat/timeout.yaml | 377 ++++++++++++++++++ tests/integrational/tornado/test_heartbeat.py | 19 +- tests/integrational/tornado/test_subscribe.py | 6 +- 3 files changed, 393 insertions(+), 9 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/heartbeat/timeout.yaml diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml new file mode 100644 index 00000000..39617960 --- /dev/null +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -0,0 +1,377 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} + headers: + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:21:58 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341188112072 + response: + body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": + 1},"b":"heartbeat-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Content-Length + - ['315'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:21:59 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + response: + body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} + headers: + - !!python/tuple + - Content-Length + - ['45'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:21:59 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341195231188 + response: + body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": + 2},"b":"heartbeat-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Content-Length + - ['316'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:00 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: + - !!python/tuple + - Content-Length + - ['55'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:02 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: + - !!python/tuple + - Content-Length + - ['55'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:05 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['3'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: + - !!python/tuple + - Content-Length + - ['55'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:08 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341206425665 + response: + body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": + "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", + "occupancy": 1},"b":"heartbeat-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Content-Length + - ['319'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:16 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341368999461 + response: + body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": + "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", + "occupancy": 1},"b":"heartbeat-tornado-ch-pnpres"}]}'} + headers: + - !!python/tuple + - Content-Length + - ['318'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:16 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} + headers: + - !!python/tuple + - Content-Length + - ['74'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Wed, 24 Aug 2016 10:22:17 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-listener +version: 1 diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py index 9c963d9a..3e0a18bb 100644 --- a/tests/integrational/tornado/test_heartbeat.py +++ b/tests/integrational/tornado/test_heartbeat.py @@ -5,8 +5,8 @@ from tornado.testing import AsyncTestCase from tornado import gen from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener -from tests import helper from tests.helper import pnconf_sub_copy +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep pn.set_stream_logger('pubnub', logging.DEBUG) @@ -24,19 +24,26 @@ def setUp(self): messenger_config = pnconf_sub_copy() messenger_config.set_presence_timeout(8) - messenger_config.uuid = helper.gen_channel("messenger") + messenger_config.uuid = "heartbeat-tornado-messenger" listener_config = pnconf_sub_copy() - listener_config.uuid = helper.gen_channel("listener") + listener_config.uuid = "heartbeat-tornado-listener" self.pubnub = PubNubTornado(messenger_config, custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(listener_config, custom_ioloop=self.io_loop) - self.pubnub.config.uuid = helper.gen_channel("messenger") - self.pubnub_listener.config.uuid = helper.gen_channel("listener") + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/heartbeat/timeout.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], + match_on_kwargs={ + 'string_list_in_path': { + 'positions': [4] + } + }) @tornado.testing.gen_test(timeout=20) def test_timeout_event_on_broken_heartbeat(self): - ch = helper.gen_channel("heartbeat-test") + ch = "heartbeat-tornado-ch" # - connect to :ch-pnpres callback_presence = SubscribeListener() diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 9e616765..c12282ae 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -25,9 +25,9 @@ def setUp(self): self.pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) self.pubnub_listener = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) - # @use_cassette_and_stub_time_sleep( - # 'tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml', - # filter_query_parameters=['uuid', 'seqn']) + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml', + filter_query_parameters=['uuid', 'seqn']) @tornado.testing.gen_test(timeout=300) def test_subscribe_unsubscribe(self): ch = "subscribe-tornado-ch" From 5dac68fc58bdd6cd5954cdacc192a1ab09324df8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 29 Aug 2016 10:40:00 -0700 Subject: [PATCH 303/468] Add state to hb requests --- pubnub/dtos.py | 7 ++ pubnub/endpoints/presence/set_state.py | 8 ++ pubnub/managers.py | 17 +++ tests/integrational/asyncio/test_state.py | 48 ++++++- .../single_channel_with_subscription.yaml | 117 ++++++++++++++++++ 5 files changed, 195 insertions(+), 2 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml diff --git a/pubnub/dtos.py b/pubnub/dtos.py index fa450953..18c418d5 100644 --- a/pubnub/dtos.py +++ b/pubnub/dtos.py @@ -21,3 +21,10 @@ def __init__(self, channels=None, channel_groups=None): self.channels = channels self.channel_groups = channel_groups + + +class StateOperation(object): + def __init__(self, channels=None, channel_groups=None, state=None): + self.channels = channels + self.channel_groups = channel_groups + self.state = state diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index 8658031a..0b95ad04 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -1,4 +1,5 @@ from pubnub import utils +from pubnub.dtos import StateOperation from pubnub.endpoints.endpoint import Endpoint from pubnub.errors import PNERR_STATE_MISSING, PNERR_STATE_SETTER_FOR_GROUPS_NOT_SUPPORTED_YET from pubnub.exceptions import PubNubException @@ -32,6 +33,13 @@ def state(self, state): return self def build_params(self): + if self._subscription_manager is not None: + self._subscription_manager.adapt_state_builder(StateOperation( + channels=self._channels, + channel_groups=self._groups, + state=self._state + )) + params = self.default_params() params['state'] = utils.url_encode(utils.write_value_as_string(self._state)) diff --git a/pubnub/managers.py b/pubnub/managers.py index 83f004ea..39dcac62 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -70,6 +70,19 @@ def adapt_unsubscribe_builder(self, unsubscribe_operation): if group in self._presence_groups: self._presence_groups.pop(group) + def adapt_state_builder(self, state_operation): + for channel in state_operation.channels: + subscribed_channel = self._channels.get(channel) + + if subscribed_channel is not None: + subscribed_channel.state = state_operation.state + + for group in state_operation.channel_groups: + subscribed_group = self._channels.get(group) + + if subscribed_group is not None: + subscribed_group.state = state_operation.state + def state_payload(self): state = {} @@ -201,6 +214,10 @@ def adapt_unsubscribe_builder(self, unsubscribe_operation): self._timetoken = 0 self.reconnect() + def adapt_state_builder(self, state_operation): + self._subscription_state.adapt_state_builder(state_operation) + self.reconnect() + @abstractmethod def reconnect(self): pass diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index 57ffdc91..e7b254dd 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -1,7 +1,9 @@ +import asyncio import pytest -from pubnub.pubnub_asyncio import PubNubAsyncio -from tests.helper import pnconf, pnconf_copy +from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from tests.helper import pnconf, pnconf_copy, pnconf_sub_copy +from tests.integrational.vcr_asyncio_sleeper import get_sleeper from tests.integrational.vcr_helper import pn_vcr @@ -34,6 +36,48 @@ def test_single_channel(event_loop): pubnub.stop() +@get_sleeper('tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml') +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'host', 'path', 'state_object_in_query']) +@pytest.mark.asyncio +def test_single_channel_with_subscription(event_loop, sleeper=asyncio.sleep): + pnconf = pnconf_sub_copy() + pnconf.set_presence_timeout(12) + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + ch = 'test-state-asyncio-ch' + pubnub.config.uuid = 'test-state-asyncio-uuid' + state = {"name": "Alex", "count": 5} + + callback = SubscribeListener() + pubnub.add_listener(callback) + pubnub.subscribe().channels(ch).execute() + + yield from callback.wait_for_connect() + yield from sleeper(20) + + env = yield from pubnub.set_state() \ + .channels(ch) \ + .state(state) \ + .future() + + assert env.result.state['name'] == "Alex" + assert env.result.state['count'] == 5 + + env = yield from pubnub.get_state() \ + .channels(ch) \ + .future() + + assert env.result.channels[ch]['name'] == "Alex" + assert env.result.channels[ch]['count'] == 5 + + pubnub.unsubscribe().channels(ch).execute() + yield from callback.wait_for_disconnect() + + pubnub.stop() + + @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/state/multiple_channel.yaml', filter_query_parameters=['uuid'], diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml new file mode 100644 index 00000000..5e22a814 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -0,0 +1,117 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + response: + body: {string: '{"t":{"t":"14724899162046665","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:36 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:58:45 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:58:47 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:58:52 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:58:57 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": + "Alex"}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": + "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": + "test-state-asyncio-ch"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, + 29 Aug 2016 16:59:01 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid +version: 1 From d6534af86d276613ef440a15d0a2ceff3adcf445 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 29 Aug 2016 11:06:16 -0700 Subject: [PATCH 304/468] Add codecov to travis config --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d8802a5b..ce1b6923 100755 --- a/.travis.yml +++ b/.travis.yml @@ -7,5 +7,9 @@ python: - "3.5" - "pypy" sudo: false -install: bash scripts/install.sh -script: python scripts/run-tests.py +install: + - bash scripts/install.sh +script: + - python scripts/run-tests.py +after_success: + - bash <(curl -s https://codecov.io/bash) From e6131a603acc8781eff1a443a2cc052610771836 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 29 Aug 2016 12:32:53 -0700 Subject: [PATCH 305/468] Remove extra logs from tornado implementation --- pubnub/pubnub_tornado.py | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index d6e9cea0..f854990e 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -91,7 +91,7 @@ def request_deferred(self, *args): raise NotImplementedError def request_future(self, options_func, create_response, - create_status_response, cancellation_event): + create_status_response, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -272,16 +272,11 @@ def reconnect(self): @tornado.gen.coroutine def _start_subscribe_loop(self): - # - gotResultEvent - # - resubscribeEvent - # - cancelEvent try: - combined_channels = self._subscription_state.prepare_channel_list(True) - print(">>> Subscribing with %s" % combined_channels) self._stop_subscribe_loop() - print(">>> locking...") + yield self._subscription_lock.acquire() - print(">>> LOCKED") + self._cancellation_event = Event() combined_channels = self._subscription_state.prepare_channel_list(True) @@ -304,17 +299,13 @@ def _start_subscribe_loop(self): while not wi.done(): try: result = yield wi.next() - print("result is %s" % result) - except GeneratorExit as e: - print("generator exit inner") - # raise StopIteration except Exception as e: - print("Exception!!! {}".format(e)) + logger.error(e) + raise else: if wi.current_future == envelope_future: envelope = result elif wi.current_future == self._cancellation_event.wait(): - print("Call Cancelled {}".format(result)) break self._handle_endpoint_call(envelope.result, envelope.status) @@ -324,25 +315,17 @@ def _start_subscribe_loop(self): self._pubnub.ioloop.add_callback(self._start_subscribe_loop) else: self._listener_manager.announce_status(e.status) - # except GeneratorExit as e: - # print("generator exit outer") - # return except Exception as e: logger.error(e) raise finally: - print("Finally clean up here") - print("Finally set") self._cancellation_event.set() yield tornado.gen.moment - print("Finally reset") self._cancellation_event = None self._subscription_lock.release() - print(">>> RELEASED") def _stop_subscribe_loop(self): if self._cancellation_event is not None: - print("Cancelling %s" % self._cancellation_event) self._cancellation_event.set() def _stop_heartbeat_timer(self): From 058a3b9c049112cc5bfbe612692831f8873bbff4 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 3 Sep 2016 12:46:31 -0700 Subject: [PATCH 306/468] Add explicit coverage file path --- .coveragerc | 2 ++ scripts/run-tests.py | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc new file mode 100644 index 00000000..a0278d5d --- /dev/null +++ b/.coveragerc @@ -0,0 +1,2 @@ +[run] +data_file = ../.coverage \ No newline at end of file diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 34a052cf..2f06226c 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -14,6 +14,7 @@ pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) +cmn = 'py.test --cov-config=.coveragerc --cov=../pubnub --ignore=integrational/twisted/ ' print("Version is", version) @@ -22,19 +23,19 @@ def run(command): return check_call(command, shell=True) if version.startswith('2.6'): - run('py.test --cov=../pubnub --ignore=integrational/tornado/ --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') + run('%s--ignore=integrational/tornado/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) elif version.startswith('2.7'): # TODO: remove twisted ignore option when the tests will be ready - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') + run('%s--ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) elif version.startswith('3.3'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') + run('%s--ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) elif version.startswith('3.4'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/python_v35/') + run('%s--ignore=integrational/python_v35/' % cmn) elif version.startswith('3.5'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/') + run(cmn) elif version.startswith('3.6'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/') + run(cmn) elif version.startswith('pypy'): - run('py.test --cov=../pubnub --ignore=integrational/twisted/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/') + run('%s--ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) else: raise Exception("Version %s is not supported by this script runner" % version) From 192e4a523c183545918b68729d25f8a47f0bdcb1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 3 Sep 2016 13:32:44 -0700 Subject: [PATCH 307/468] Fix coverage config --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 2f06226c..fb7e42df 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -14,7 +14,7 @@ pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) -cmn = 'py.test --cov-config=.coveragerc --cov=../pubnub --ignore=integrational/twisted/ ' +cmn = 'py.test --cov-config=../coveragerc --cov=../pubnub --ignore=integrational/twisted/ ' print("Version is", version) From 1c9665db15fb1ba36b5bc5a98a363405837d868e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 3 Sep 2016 13:34:56 -0700 Subject: [PATCH 308/468] Fix coverage config --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index fb7e42df..96685744 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -14,7 +14,7 @@ pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) -cmn = 'py.test --cov-config=../coveragerc --cov=../pubnub --ignore=integrational/twisted/ ' +cmn = 'py.test --cov-config=../.coveragerc --cov=../pubnub --ignore=integrational/twisted/ ' print("Version is", version) From 6cfba93f0b8eb283a2ee5e70042bd60408a7ebf6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 3 Sep 2016 14:49:16 -0700 Subject: [PATCH 309/468] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ce1b6923..41f5baca 100755 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,4 @@ install: script: - python scripts/run-tests.py after_success: - - bash <(curl -s https://codecov.io/bash) + - codecov From 281b4c9065dee8c395327a84b01fec5c0feb976f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 4 Sep 2016 05:36:53 -0700 Subject: [PATCH 310/468] Reconfigure coverage --- .coveragerc | 2 -- scripts/run-tests.py | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index a0278d5d..00000000 --- a/.coveragerc +++ /dev/null @@ -1,2 +0,0 @@ -[run] -data_file = ../.coverage \ No newline at end of file diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 96685744..80f65728 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -9,12 +9,12 @@ _dname = os.path.dirname REPO_ROOT = _dname(_dname(os.path.abspath(__file__))) -os.chdir(os.path.join(REPO_ROOT, 'tests')) +os.chdir(os.path.join(REPO_ROOT)) pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) -cmn = 'py.test --cov-config=../.coveragerc --cov=../pubnub --ignore=integrational/twisted/ ' +cmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/integrational/twisted ' print("Version is", version) From d0ed57769177eecfb5152482fd4dc36fa691e5b6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 4 Sep 2016 06:27:11 -0700 Subject: [PATCH 311/468] Fix tests runner --- scripts/run-tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 80f65728..dd8810ce 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -23,19 +23,19 @@ def run(command): return check_call(command, shell=True) if version.startswith('2.6'): - run('%s--ignore=integrational/tornado/ --ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) + run('%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) elif version.startswith('2.7'): # TODO: remove twisted ignore option when the tests will be ready - run('%s--ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) + run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) elif version.startswith('3.3'): - run('%s--ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) + run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) elif version.startswith('3.4'): - run('%s--ignore=integrational/python_v35/' % cmn) + run('%s--ignore=tests/integrational/python_v35/ ' % cmn) elif version.startswith('3.5'): run(cmn) elif version.startswith('3.6'): run(cmn) elif version.startswith('pypy'): - run('%s--ignore=integrational/asyncio/ --ignore=integrational/python_v35/' % cmn) + run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) else: raise Exception("Version %s is not supported by this script runner" % version) From a7cbfdbbb7b58b8c4305c0149bac47980c1553db Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 4 Sep 2016 07:17:38 -0700 Subject: [PATCH 312/468] Add README.md --- README.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..42125bcf --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +# PubNub Python SDK (V4) + +`TODO: update branch reference` +[![Build Status](https://travis-ci.org/pubnub/python.svg?branch=edge)](https://travis-ci.org/pubnub/python) +[![codecov](https://codecov.io/gh/pubnub/python/branch/edge/graph/badge.svg)](https://codecov.io/gh/pubnub/python) +[![PyPI](https://img.shields.io/pypi/v/pubnub.svg)](https://pypi.python.org/pypi/pubnub/) +[![PyPI](https://img.shields.io/pypi/pyversions/pubnub.svg?maxAge=2592000)](https://pypi.python.org/pypi/pubnub/) +[![Docs](https://img.shields.io/badge/docs-online-blue.svg)](https://www.pubnub.com/docs/python/pubnub-python-sdk) + +The SDK supports Python 2.6, 2.7, 3.3, 3.4, 3.5 and pypy. + +### Looking for Python V3 SDK? +`TODO: update branch reference` +please use the [master_3x](https://github.com/pubnub/python/tree/master) branch + +## Communication + +- If you **need help** or have a **general question**, contact From fdcb1f2f324f01259792309c21c66f957c10f9d6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 4 Sep 2016 15:26:51 -0700 Subject: [PATCH 313/468] Add flake8 validation, refactoring; Extend tornado/chat example --- examples/__init__.py | 3 +- examples/here_now.py | 20 ------- examples/native_threads/__init__.py | 0 examples/{ => native_threads}/publish.py | 17 +++--- examples/tornado/chat/app.py | 64 ++++++++++++--------- examples/tornado/chat/index.html | 21 ++----- examples/twisted/here_now.py | 1 + pubnub/endpoints/endpoint.py | 1 - pubnub/endpoints/presence/here_now.py | 2 +- pubnub/models/consumer/history.py | 1 - pubnub/models/consumer/push.py | 1 + pubnub/pubnub.py | 8 ++- pubnub/pubnub_asyncio.py | 12 ++-- pubnub/request_handlers/requests_handler.py | 4 +- pubnub/utils.py | 2 +- requirements27-dev.txt | 1 + requirements33-dev.txt | 1 + requirements34-dev.txt | 1 + requirements35-dev.txt | 1 + setup.cfg | 3 + 20 files changed, 81 insertions(+), 83 deletions(-) delete mode 100755 examples/here_now.py create mode 100644 examples/native_threads/__init__.py rename examples/{ => native_threads}/publish.py (55%) diff --git a/examples/__init__.py b/examples/__init__.py index aa839322..d1f2589f 100755 --- a/examples/__init__.py +++ b/examples/__init__.py @@ -3,4 +3,5 @@ pnconf = PNConfiguration() pnconf.subscribe_key = "demo" -pnconf.publish_key = "demo" \ No newline at end of file +pnconf.publish_key = "demo" +pnconf.enable_subscribe = False diff --git a/examples/here_now.py b/examples/here_now.py deleted file mode 100755 index 915d97cf..00000000 --- a/examples/here_now.py +++ /dev/null @@ -1,20 +0,0 @@ -# PubNub HereNow usage example -import logging -import sys - -sys.path.append("../") - -import pubnub -from examples import pnconf -from pubnub.pubnub import PubNub - -pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) - -pubnub = PubNub(pnconf) - -res = pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .sync() - -print(res.total_occupancy) diff --git a/examples/native_threads/__init__.py b/examples/native_threads/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/publish.py b/examples/native_threads/publish.py similarity index 55% rename from examples/publish.py rename to examples/native_threads/publish.py index d27700d6..88c4f388 100755 --- a/examples/publish.py +++ b/examples/native_threads/publish.py @@ -6,22 +6,21 @@ import pubnub from examples import pnconf -from pubnub.pubnub import PubNub +from pubnub.pubnub import PubNub, NonSubscribeListener pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) -pnconf.publish_key="blah" pubnub = PubNub(pnconf) -def success(msg): - print("success", msg) -def error(err): - print("error", err) +listener = NonSubscribeListener() -thread = pubnub.publish() \ +pubnub.publish() \ .channel("blah") \ .message("hey") \ - .async(success, error) + .async(listener.callback) -thread.join() +result = listener.await_result_and_reset(5) +print(result) + +pubnub.stop() \ No newline at end of file diff --git a/examples/tornado/chat/app.py b/examples/tornado/chat/app.py index ca580894..f031d8ea 100644 --- a/examples/tornado/chat/app.py +++ b/examples/tornado/chat/app.py @@ -4,37 +4,46 @@ import sys import os -from pubnub.callbacks import SubscribeCallback -from pubnub.exceptions import PubNubException - d = os.path.dirname PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) sys.path.append(PUBNUB_ROOT) + +from pubnub.pubnub_tornado import SubscribeListener +from pubnub.exceptions import PubNubException from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_tornado import PubNubTornado, PubNubTornadoException + pnconf = PNConfiguration() pnconf.subscribe_key = "demo" pnconf.publish_key = "demo" +channel = "my_channel" pubnub = PubNubTornado(pnconf) class MainHandler(tornado.web.RequestHandler): + def data_received(self, chunk): + pass + @tornado.web.asynchronous def get(self): self.render("index.html") class AsyncHandler(tornado.web.RequestHandler): + def data_received(self, chunk): + pass + @tornado.web.asynchronous def get(self): - pubnub.publish().channel("my_channel").message("hello").future().add_done_callback(self.callback) + pubnub.publish().channel(channel).message("hello from callback-based publish")\ + .future().add_done_callback(self.callback) def callback(self, future): if future.exception() is not None: - self.set_status(404) + self.set_status(500) self.write("Something went wrong:" + str(future.exception())) else: envelope = future.result() @@ -48,44 +57,47 @@ class YieldHandler(tornado.web.RequestHandler): @tornado.gen.coroutine def get(self): try: - envelope = yield pubnub.publish().channel("my_channel").message("hello").future() + envelope = yield pubnub.publish().channel(channel).message("hello from yield-based publish").future() self.write(str(envelope.status.original_response)) except PubNubTornadoException as e: + self.set_status(500) self.write(str(e)) -class Subscription(SubscribeCallback): - @tornado.gen.coroutine - def status(self, pubnub, status): - print('# satus', str(status)) - try: - yield pubnub.publish().channel("my_channel").message("hey").future() - except Exception as e: - print("failed to publish" + str(e)) - - def presence(self, pubnub, presence): - print('# presence') - - def message(self, pubnub, result): - print('# message', result.message) - +class UnsubscribeHandler(tornado.web.RequestHandler): + def data_received(self, chunk): + pass -class StopHandler(tornado.web.RequestHandler): @tornado.gen.coroutine def get(self): + listener = SubscribeListener() + pubnub.add_listener(listener) + try: - pubnub.stop() + pubnub.unsubscribe().channels(channel).execute() + yield listener.wait_for_disconnect() + self.write("unsubscribed from %s" % channel) except PubNubException as e: self.write(str(e)) class SubscribeHandler(tornado.web.RequestHandler): + def data_received(self, chunk): + pass + @tornado.gen.coroutine def get(self): - pubnub.add_listener(Subscription()) + listener = SubscribeListener() + pubnub.add_listener(listener) try: - pubnub.subscribe().channels("my_channel").execute() + pubnub.subscribe().channels(channel).execute() + yield listener.wait_for_connect() + res = yield listener.wait_for_message_on(channel) + pubnub.unsubscribe().channels(channel).execute() + yield listener.wait_for_disconnect() + self.write(str(res.message)) + except PubNubException as e: self.write(str(e)) @@ -96,7 +108,7 @@ def make_app(): (r"/publish_callback", AsyncHandler), (r"/publish_yield", YieldHandler), (r"/subscribe", SubscribeHandler), - (r"/unsubscribe", StopHandler), + (r"/unsubscribe", UnsubscribeHandler), ]) if __name__ == "__main__": diff --git a/examples/tornado/chat/index.html b/examples/tornado/chat/index.html index f6fe7133..58e17f5c 100644 --- a/examples/tornado/chat/index.html +++ b/examples/tornado/chat/index.html @@ -5,22 +5,13 @@ - - - - - - - - PubNub Tornado Chat Demo App + PubNub Tornado Subscribe/Unsubscribe Example -
      -
      -
      - -
      -
      -
      +

      Select an action:

      +/subscribe
      +/unsubscribe
      +/publish_yield
      +/publish_callback \ No newline at end of file diff --git a/examples/twisted/here_now.py b/examples/twisted/here_now.py index c2230e19..84f83225 100644 --- a/examples/twisted/here_now.py +++ b/examples/twisted/here_now.py @@ -6,6 +6,7 @@ from pubnub.pubnub_twisted import PubNubTwisted from pubnub.pnconfiguration import PNConfiguration + pnconf = PNConfiguration() pubnub = PubNubTwisted(pnconf) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index e856cf0e..8c4309ee 100755 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -179,4 +179,3 @@ def create_status_response(self, category, response, response_info, exception): pn_status.affected_channels_groups = self.affected_channels_groups() return pn_status - diff --git a/pubnub/endpoints/presence/here_now.py b/pubnub/endpoints/presence/here_now.py index 60beb4e0..7bad78f3 100755 --- a/pubnub/endpoints/presence/here_now.py +++ b/pubnub/endpoints/presence/here_now.py @@ -28,7 +28,7 @@ def include_state(self, should_include_state): return self def include_uuids(self, include_uuids): - self._include_uuids= include_uuids + self._include_uuids = include_uuids return self def build_params(self): diff --git a/pubnub/models/consumer/history.py b/pubnub/models/consumer/history.py index 66ddc201..3e3f218b 100644 --- a/pubnub/models/consumer/history.py +++ b/pubnub/models/consumer/history.py @@ -40,4 +40,3 @@ def __init__(self, entry, timetoken=None): def decrypt(self, cipher_key): self.entry = pn_crypto.decrypt(cipher_key, self.entry) - diff --git a/pubnub/models/consumer/push.py b/pubnub/models/consumer/push.py index da304934..9c840fa8 100644 --- a/pubnub/models/consumer/push.py +++ b/pubnub/models/consumer/push.py @@ -10,6 +10,7 @@ class PNPushRemoveChannelResult(object): class PNPushRemoveAllChannelsResult(object): pass + class PNPushListProvisionsResult(object): def __init__(self, channels): self.channels = channels diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 65138216..19d67786 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -61,7 +61,10 @@ def request_async(self, endpoint_name, endpoint_call_options, callback, cancella callback, cancellation_event) def stop(self): - self._subscription_manager.stop() + if self._subscription_manager is not None: + self._subscription_manager.stop() + else: + raise Exception("Subscription manager is not enabled for this instance") def request_deferred(self, options_func): raise NotImplementedError @@ -317,10 +320,12 @@ def wait_for_presence_on(self, *channel_names): class NonSubscribeListener(object): def __init__(self): self.result = None + self.status = None self.done_event = Event() def callback(self, result, status): self.result = result + self.status = status self.done_event.set() def await(self, timeout=5): @@ -339,4 +344,5 @@ def await_result_and_reset(self, timeout=5): def reset(self): self.result = None + self.status = None self.done_event.clear() diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 04cceaf3..3fe9633d 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -53,6 +53,8 @@ def stop(self): self._session.close() if self._subscription_manager is not None: self._subscription_manager.stop() + else: + raise Exception("Subscription manager is not enabled for this instance") def sdk_platform(self): return "-Asyncio" @@ -253,11 +255,11 @@ def _start_subscribe_loop(self): try: self._subscribe_request_task = asyncio.ensure_future( Subscribe(self._pubnub) - .channels(combined_channels) - .channel_groups(combined_groups) - .timetoken(self._timetoken).region(self._region) - .filter_expression(self._pubnub.config.filter_expression) - .future()) + .channels(combined_channels) + .channel_groups(combined_groups) + .timetoken(self._timetoken).region(self._region) + .filter_expression(self._pubnub.config.filter_expression) + .future()) envelope = yield from self._subscribe_request_task diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index e969c276..13e8cef4 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -6,8 +6,8 @@ from requests import Session from pubnub import utils from pubnub.enums import PNStatusCategory -from pubnub.errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR, PNERR_CLIENT_TIMEOUT, \ - PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR +from pubnub.errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR,\ + PNERR_CLIENT_TIMEOUT, PNERR_HTTP_ERROR, PNERR_CONNECTION_ERROR from pubnub.errors import PNERR_SERVER_ERROR from pubnub.exceptions import PubNubException from pubnub.request_handlers.base import BaseRequestHandler diff --git a/pubnub/utils.py b/pubnub/utils.py index f1440fe8..6a2bbf02 100755 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -98,7 +98,7 @@ def is_subscribed_event(status): def is_unsubscribed_event(status): assert isinstance(status, PNStatus) return status.category == PNStatusCategory.PNAcknowledgmentCategory \ - and status.operation == PNOperationType.PNUnsubscribeOperation + and status.operation == PNOperationType.PNUnsubscribeOperation def prepare_pam_arguments(unsorted_params): diff --git a/requirements27-dev.txt b/requirements27-dev.txt index 7a69c64c..64ec8f44 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,4 +1,5 @@ twisted tornado pyopenssl +flake8 -e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py2.7.egg diff --git a/requirements33-dev.txt b/requirements33-dev.txt index 02065620..628fe7f4 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,2 +1,3 @@ tornado +flake8 -e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.3.egg diff --git a/requirements34-dev.txt b/requirements34-dev.txt index 563a6a19..d2bdb8ca 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -1,4 +1,5 @@ pytest-asyncio tornado aiohttp +flake8 -e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.4.egg diff --git a/requirements35-dev.txt b/requirements35-dev.txt index af18a5c7..ab43cbd2 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -1,4 +1,5 @@ pytest-asyncio tornado aiohttp +flake8 -e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.5.egg diff --git a/setup.cfg b/setup.cfg index 51549a47..4523b1aa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,6 @@ [tool:pytest] norecursedirs = benchmarks +[flake8] +max-line-length = 120 +exclude=src/,.cache,.git,.idea,.tox,._trial_temp/ \ No newline at end of file From d789781ba293d4341447c3dfbc53f571282fcc8a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 4 Sep 2016 15:30:57 -0700 Subject: [PATCH 314/468] Rename tornado example chat=>http --- examples/tornado/{chat => http}/__init__.py | 0 examples/tornado/{chat => http}/app.py | 0 examples/tornado/{chat => http}/index.html | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename examples/tornado/{chat => http}/__init__.py (100%) rename examples/tornado/{chat => http}/app.py (100%) rename examples/tornado/{chat => http}/index.html (100%) diff --git a/examples/tornado/chat/__init__.py b/examples/tornado/http/__init__.py similarity index 100% rename from examples/tornado/chat/__init__.py rename to examples/tornado/http/__init__.py diff --git a/examples/tornado/chat/app.py b/examples/tornado/http/app.py similarity index 100% rename from examples/tornado/chat/app.py rename to examples/tornado/http/app.py diff --git a/examples/tornado/chat/index.html b/examples/tornado/http/index.html similarity index 100% rename from examples/tornado/chat/index.html rename to examples/tornado/http/index.html From ccfd8beed35f2cf69a1df20506a0b8510c87c085 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 06:30:42 -0700 Subject: [PATCH 315/468] Reformat files to fit pep8 requirements --- examples/native_threads/publish.py | 2 +- pubnub/endpoints/access/audit.py | 3 +- pubnub/endpoints/access/grant.py | 3 +- pubnub/managers.py | 4 +- pubnub/pubnub.py | 2 +- pubnub/pubnub_asyncio.py | 4 +- pubnub/pubnub_core.py | 3 +- pubnub/pubnub_tornado.py | 5 +-- scripts/run-tests.py | 4 +- setup.cfg | 3 +- .../push/test_list_push_provisions.py | 1 - .../push/test_remove_channels_from_push.py | 3 +- tests/functional/test_publish.py | 2 - tests/helper.py | 3 +- tests/integrational/asyncio/test_publish.py | 42 +++++++++---------- tests/integrational/asyncio/test_state.py | 18 ++++---- tests/integrational/asyncio/test_subscribe.py | 2 +- tests/integrational/asyncio/test_time.py | 4 +- tests/integrational/native_sync/test_ssl.py | 1 - .../native_threads/test_channel_groups.py | 21 +++++----- .../native_threads/test_subscribe.py | 2 +- .../test_asyncio_async_await_syntax.py | 2 +- .../test_tornado_async_await_syntax.py | 2 - .../tornado/test_channel_groups.py | 2 +- tests/integrational/tornado/test_here_now.py | 2 +- tests/integrational/tornado/test_state.py | 2 +- tests/integrational/tornado/test_where_now.py | 2 +- tests/integrational/tornado/tornado_helper.py | 1 - .../tornado/vcr_tornado_decorator.py | 4 +- tests/integrational/twisted/test_here_now.py | 1 - tests/integrational/twisted/test_publish.py | 8 ++-- tests/integrational/vcr_asyncio_sleeper.py | 2 +- tests/integrational/vcr_helper.py | 4 +- tests/unit/test_crypto.py | 3 +- tests/unit/test_herenow.py | 2 +- tests/unit/test_utils.py | 9 ++-- tests/unit/test_vcr_helper.py | 14 +++++-- 37 files changed, 96 insertions(+), 96 deletions(-) diff --git a/examples/native_threads/publish.py b/examples/native_threads/publish.py index 88c4f388..eb64b5be 100755 --- a/examples/native_threads/publish.py +++ b/examples/native_threads/publish.py @@ -23,4 +23,4 @@ result = listener.await_result_and_reset(5) print(result) -pubnub.stop() \ No newline at end of file +pubnub.stop() diff --git a/pubnub/endpoints/access/audit.py b/pubnub/endpoints/access/audit.py index 075a8903..4b5ece3a 100644 --- a/pubnub/endpoints/access/audit.py +++ b/pubnub/endpoints/access/audit.py @@ -36,8 +36,7 @@ def channel_groups(self, channel_groups): def build_params(self): params = self.default_params() - signed_input = (self.pubnub.config.subscribe_key + "\n" - + self.pubnub.config.publish_key + "\naudit\n") + signed_input = (self.pubnub.config.subscribe_key + "\n" + self.pubnub.config.publish_key + "\naudit\n") if len(self._auth_keys) > 0: params['auth'] = utils.join_items_and_encode(self._auth_keys) diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index 21c78f29..264a4f5d 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -50,8 +50,7 @@ def manage(self, flag): def build_params(self): params = self.default_params() - signed_input = (self.pubnub.config.subscribe_key + "\n" - + self.pubnub.config.publish_key + "\ngrant\n") + signed_input = (self.pubnub.config.subscribe_key + "\n" + self.pubnub.config.publish_key + "\ngrant\n") if self._read is not None: params['r'] = '1' if self._read is True else '0' diff --git a/pubnub/managers.py b/pubnub/managers.py index 39dcac62..09904d88 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -32,11 +32,11 @@ def __init__(self): def is_empty(self): return len(self._channels) == 0 and len(self._groups) == 0 and\ - len(self._presence_channels) == 0 and len(self._presence_groups) == 0 + len(self._presence_channels) == 0 and len(self._presence_groups) == 0 def subscribed_to_the_only_channel(self): return len(self._channels) == 1 and len(self._groups) == 0 and\ - len(self._presence_channels) == 0 and len(self._presence_groups) == 0 + len(self._presence_channels) == 0 and len(self._presence_groups) == 0 def prepare_channel_list(self, include_presence): return StateManager._prepare_membership_list( diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 19d67786..96d46f34 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -136,7 +136,7 @@ def heartbeat_callback(raw_result, status): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 3fe9633d..43d234bf 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -53,8 +53,6 @@ def stop(self): self._session.close() if self._subscription_manager is not None: self._subscription_manager.stop() - else: - raise Exception("Subscription manager is not enabled for this instance") def sdk_platform(self): return "-Asyncio" @@ -326,7 +324,7 @@ def _perform_heartbeat_loop(self): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index c6321600..d1342f6e 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -58,7 +58,8 @@ def sdk_name(self): return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) @abstractmethod - def sdk_platform(self): pass + def sdk_platform(self): + pass @property def uuid(self): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index f854990e..eaa5b832 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -155,8 +155,7 @@ def response_callback(response): create_status_response(status_category, response, response_info, PubNubException( pn_error=PNERR_JSON_DECODING_FAILED, errormsg='json decode error') - ) - ) + )) future.set_exception(tornado_result) return else: @@ -367,7 +366,7 @@ def _perform_heartbeat_loop(self): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: diff --git a/scripts/run-tests.py b/scripts/run-tests.py index dd8810ce..e874267f 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -22,8 +22,10 @@ def run(command): return check_call(command, shell=True) + if version.startswith('2.6'): - run('%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) + run( + '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) # noqa: E501 elif version.startswith('2.7'): # TODO: remove twisted ignore option when the tests will be ready run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) diff --git a/setup.cfg b/setup.cfg index 4523b1aa..981dc80c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,4 +3,5 @@ norecursedirs = benchmarks [flake8] max-line-length = 120 -exclude=src/,.cache,.git,.idea,.tox,._trial_temp/ \ No newline at end of file +exclude=src/,.cache,.git,.idea,.tox,._trial_temp/ +ignore=E402 \ No newline at end of file diff --git a/tests/functional/push/test_list_push_provisions.py b/tests/functional/push/test_list_push_provisions.py index c39c9bd0..d1b3c9df 100644 --- a/tests/functional/push/test_list_push_provisions.py +++ b/tests/functional/push/test_list_push_provisions.py @@ -36,7 +36,6 @@ def test_list_channel_group_apns(self): 'type': 'apns' }) - def test_list_channel_group_gcm(self): self.list_push.push_type(PNPushType.GCM).device_id('coolDevice') diff --git a/tests/functional/push/test_remove_channels_from_push.py b/tests/functional/push/test_remove_channels_from_push.py index 64f851ab..d7f2bf46 100644 --- a/tests/functional/push/test_remove_channels_from_push.py +++ b/tests/functional/push/test_remove_channels_from_push.py @@ -56,7 +56,8 @@ def test_push_remove_multiple_channels(self): self.assertEqual(self.remove_channels._channels, ['ch1', 'ch2']) def test_push_remove_google(self): - self.remove_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.GCM).device_id("coolDevice") + self.remove_channels.channels(['ch1', 'ch2', 'ch3']).push_type(pubnub.enums.PNPushType.GCM)\ + .device_id("coolDevice") params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index dcbe303b..594f515a 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -1,5 +1,4 @@ import copy -import json import unittest try: @@ -161,4 +160,3 @@ def test_pub_encrypted_list_message(self): 'pnsdk': sdk_name, 'uuid': pubnub.uuid, }) - diff --git a/tests/helper.py b/tests/helper.py index 78a5c597..a1d996cf 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -11,7 +11,8 @@ try: from mock import patch except ImportError: - from unittest.mock import patch + + from unittest.mock import patch # noqa: F401 pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" sub_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index 470fecfe..c8741f8f 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -114,11 +114,11 @@ def test_publish_mixed_via_get_encrypted(event_loop): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], - match_on=['host', 'method', 'query', 'object_in_path'], - match_on_kwargs={'object_in_path': { - 'decrypter': gen_decrypt_func('testKey')}}) + 'tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['host', 'method', 'query', 'object_in_path'], + match_on_kwargs={'object_in_path': { + 'decrypter': gen_decrypt_func('testKey')}}) @pytest.mark.asyncio def test_publish_object_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) @@ -128,9 +128,9 @@ def test_publish_object_via_get_encrypted(event_loop): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], - match_on=['method', 'path', 'query', 'body']) + 'tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'body']) @pytest.mark.asyncio def test_publish_mixed_via_post_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) @@ -144,11 +144,11 @@ def test_publish_mixed_via_post_encrypted(event_loop): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], - match_on=['method', 'path', 'query', 'object_in_body'], - match_on_kwargs={'object_in_body': { - 'decrypter': gen_decrypt_func('testKey')}}) + 'tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['method', 'path', 'query', 'object_in_body'], + match_on_kwargs={'object_in_body': { + 'decrypter': gen_decrypt_func('testKey')}}) @pytest.mark.asyncio def test_publish_object_via_post_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) @@ -156,6 +156,7 @@ def test_publish_object_via_post_encrypted(event_loop): pubnub.stop() + @pytest.mark.asyncio def test_error_missing_message(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -184,9 +185,9 @@ def method(): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/publish/meta_object.yaml', - filter_query_parameters=['uuid', 'seqn'], - match_on=['host', 'method', 'path', 'meta_object_in_query']) + 'tests/integrational/fixtures/asyncio/publish/meta_object.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['host', 'method', 'path', 'meta_object_in_query']) @pytest.mark.asyncio def test_publish_with_meta(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -196,8 +197,8 @@ def test_publish_with_meta(event_loop): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/publish/do_not_store.yaml', - filter_query_parameters=['uuid', 'seqn']) + 'tests/integrational/fixtures/asyncio/publish/do_not_store.yaml', + filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio def test_publish_do_not_store(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -215,8 +216,8 @@ def assert_server_side_error_yield(pub, expected_err_msg): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/publish/invalid_key.yaml', - filter_query_parameters=['uuid', 'seqn']) + 'tests/integrational/fixtures/asyncio/publish/invalid_key.yaml', + filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio def test_error_invalid_key(event_loop): conf = PNConfiguration() @@ -228,4 +229,3 @@ def test_error_invalid_key(event_loop): yield from assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "Invalid Key") pubnub.stop() - diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index e7b254dd..1ff903ec 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -8,9 +8,9 @@ @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/state/single_channel.yaml', - filter_query_parameters=['uuid'], - match_on=['method', 'host', 'path', 'state_object_in_query']) + 'tests/integrational/fixtures/asyncio/state/single_channel.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -38,9 +38,9 @@ def test_single_channel(event_loop): @get_sleeper('tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml') @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml', - filter_query_parameters=['uuid'], - match_on=['method', 'host', 'path', 'state_object_in_query']) + 'tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_single_channel_with_subscription(event_loop, sleeper=asyncio.sleep): pnconf = pnconf_sub_copy() @@ -79,9 +79,9 @@ def test_single_channel_with_subscription(event_loop, sleeper=asyncio.sleep): @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/state/multiple_channel.yaml', - filter_query_parameters=['uuid'], - match_on=['method', 'host', 'path', 'state_object_in_query']) + 'tests/integrational/fixtures/asyncio/state/multiple_channel.yaml', + filter_query_parameters=['uuid'], + match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_multiple_channels(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 0c43b906..5353ebfc 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -274,7 +274,7 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): print("subscribed to cg #3") callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_connect()) - presence_messages_future= asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) + presence_messages_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) yield from asyncio.wait([callback_messages_future, presence_messages_future]) print("connect/presence #4") prs_envelope = presence_messages_future.result() diff --git a/tests/integrational/asyncio/test_time.py b/tests/integrational/asyncio/test_time.py index 0d99f56d..96585399 100644 --- a/tests/integrational/asyncio/test_time.py +++ b/tests/integrational/asyncio/test_time.py @@ -7,8 +7,8 @@ @pn_vcr.use_cassette( - 'tests/integrational/fixtures/asyncio/time/get.yaml', - filter_query_parameters=['uuid']) + 'tests/integrational/fixtures/asyncio/time/get.yaml', + filter_query_parameters=['uuid']) @pytest.mark.asyncio def test_time(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) diff --git a/tests/integrational/native_sync/test_ssl.py b/tests/integrational/native_sync/test_ssl.py index 2b05ed3b..b759a567 100644 --- a/tests/integrational/native_sync/test_ssl.py +++ b/tests/integrational/native_sync/test_ssl.py @@ -27,4 +27,3 @@ def test_publish_string_get(self): assert env.result.timetoken > 1 except PubNubException as e: self.fail(e) - diff --git a/tests/integrational/native_threads/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py index 1b1605a3..f27e97ed 100644 --- a/tests/integrational/native_threads/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -22,8 +22,9 @@ def callback(self, response, status): self.status = status self.event.set() - @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml', - filter_query_parameters=['uuid']) + @use_cassette_and_stub_time_sleep_native( + 'tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml', + filter_query_parameters=['uuid']) def test_single_channel(self): ch = "channel-groups-unit-ch" gr = "channel-groups-unit-cg" @@ -31,8 +32,8 @@ def test_single_channel(self): # add pubnub.add_channel_to_channel_group() \ - .channels(ch)\ - .channel_group(gr)\ + .channels(ch) \ + .channel_group(gr) \ .async(self.callback) self.event.wait() @@ -43,8 +44,8 @@ def test_single_channel(self): time.sleep(1) # list - pubnub.list_channels_in_channel_group()\ - .channel_group(gr)\ + pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ .async(self.callback) self.event.wait() @@ -55,8 +56,8 @@ def test_single_channel(self): # remove pubnub.remove_channel_from_channel_group() \ - .channels(ch)\ - .channel_group(gr)\ + .channels(ch) \ + .channel_group(gr) \ .async(self.callback) self.event.wait() @@ -66,8 +67,8 @@ def test_single_channel(self): time.sleep(1) # list - pubnub.list_channels_in_channel_group()\ - .channel_group(gr)\ + pubnub.list_channels_in_channel_group() \ + .channel_group(gr) \ .async(self.callback) self.event.wait() diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index fc339f40..e84b6ad1 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -249,4 +249,4 @@ def test_subscribe_cg_join_leave(self): assert isinstance(result, PNChannelGroupsRemoveChannelResult) pubnub.stop() - pubnub_listener.stop() \ No newline at end of file + pubnub_listener.stop() diff --git a/tests/integrational/python_v35/test_asyncio_async_await_syntax.py b/tests/integrational/python_v35/test_asyncio_async_await_syntax.py index 0053b66d..28180e52 100644 --- a/tests/integrational/python_v35/test_asyncio_async_await_syntax.py +++ b/tests/integrational/python_v35/test_asyncio_async_await_syntax.py @@ -1,6 +1,6 @@ import asyncio import logging -import pytest +import pytest # noqa: F401 import pubnub as pn from pubnub.models.consumer.pubsub import PNMessageResult diff --git a/tests/integrational/python_v35/test_tornado_async_await_syntax.py b/tests/integrational/python_v35/test_tornado_async_await_syntax.py index 93eb0f6f..5796d229 100644 --- a/tests/integrational/python_v35/test_tornado_async_await_syntax.py +++ b/tests/integrational/python_v35/test_tornado_async_await_syntax.py @@ -1,6 +1,4 @@ import logging -import pytest -import sys import tornado import pubnub as pn diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py index a6974850..2be0c8fd 100644 --- a/tests/integrational/tornado/test_channel_groups.py +++ b/tests/integrational/tornado/test_channel_groups.py @@ -1,6 +1,6 @@ import tornado from tornado import gen -from tornado.testing import AsyncHTTPTestCase, AsyncTestCase +from tornado.testing import AsyncTestCase from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index d4bd3ff9..6e05ebaa 100755 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -3,7 +3,7 @@ import tornado import tornado.gen from tornado import gen -from tornado.testing import AsyncHTTPTestCase, AsyncTestCase +from tornado.testing import AsyncTestCase import pubnub as pn from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index f3c52350..d88ae805 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -1,5 +1,5 @@ import tornado -from tornado.testing import AsyncHTTPTestCase, AsyncTestCase +from tornado.testing import AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado from tests.helper import pnconf_copy diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py index e2b86884..41e5e18a 100644 --- a/tests/integrational/tornado/test_where_now.py +++ b/tests/integrational/tornado/test_where_now.py @@ -1,6 +1,6 @@ import tornado from tornado import gen -from tornado.testing import AsyncHTTPTestCase, AsyncTestCase +from tornado.testing import AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener from tests.helper import pnconf_sub_copy diff --git a/tests/integrational/tornado/tornado_helper.py b/tests/integrational/tornado/tornado_helper.py index 356bbdf3..96d6ea7b 100644 --- a/tests/integrational/tornado/tornado_helper.py +++ b/tests/integrational/tornado/tornado_helper.py @@ -37,4 +37,3 @@ def disconnect_from_channel(pubnub, channel): pubnub.add_listener(callback) pubnub.unsubscribe().channels(channel).execute() yield event.wait() - diff --git a/tests/integrational/tornado/vcr_tornado_decorator.py b/tests/integrational/tornado/vcr_tornado_decorator.py index 77811945..7d109922 100644 --- a/tests/integrational/tornado/vcr_tornado_decorator.py +++ b/tests/integrational/tornado/vcr_tornado_decorator.py @@ -23,7 +23,7 @@ def _inner(f): @patch('tornado.gen.sleep', return_value=returner()) @six.wraps(f) def stubbed(*args, **kwargs): - with context as cassette: + with context: largs = list(args) # 1 - index largs.pop(1) @@ -31,7 +31,7 @@ def stubbed(*args, **kwargs): @six.wraps(f) def original(*args): - with context as cassette: + with context: return f(*args) return stubbed if len(cs) > 0 else original diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py index e07e884c..bd705679 100755 --- a/tests/integrational/twisted/test_here_now.py +++ b/tests/integrational/twisted/test_here_now.py @@ -80,4 +80,3 @@ def error_wrapper(err): .async(success_wrapper, error_wrapper) return d - diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py index 0f8c22ec..aa86e0f6 100644 --- a/tests/integrational/twisted/test_publish.py +++ b/tests/integrational/twisted/test_publish.py @@ -52,7 +52,7 @@ def assert_success_publish_get(self, msg): def assert_success_publish_post(self, msg): return self.assert_success( PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - .publish().channel(ch).message(msg).use_post(True)) + .publish().channel(ch).message(msg).use_post(True)) def test_success_publish_string_get(self): return self.assert_success_publish_get("hey") @@ -87,12 +87,12 @@ def test_success_publish_dict_post(self): def test_success_publish_do_not_store(self): return self.assert_success( PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - .publish().channel(ch).message("hey").should_store(False)) + .publish().channel(ch).message("hey").should_store(False)) def test_success_publish_with_meta(self): return self.assert_success( PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - .publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) + .publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) class TestPubNubPublishError(TwistedTest): @@ -118,7 +118,7 @@ def errback_invalid_key(self, error): def assert_error(self, pub, errback): d = defer.Deferred() - pub.deferred()\ + pub.deferred() \ .addCallbacks(self.callback, errback) \ .addCallbacks(d.callback, d.errback) diff --git a/tests/integrational/vcr_asyncio_sleeper.py b/tests/integrational/vcr_asyncio_sleeper.py index 0d4dd085..4cbf4ac2 100644 --- a/tests/integrational/vcr_asyncio_sleeper.py +++ b/tests/integrational/vcr_asyncio_sleeper.py @@ -26,4 +26,4 @@ def call(*args, event_loop=None): yield from f(*args, sleeper=(fake_sleeper if (len(cs) > 0) else asyncio.sleep), event_loop=event_loop) return call - return decorate \ No newline at end of file + return decorate diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index e3ce33f6..391ca9cb 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -196,7 +196,7 @@ def _inner(f): @patch('time.sleep', return_value=None) @six.wraps(f) def stubbed(*args, **kwargs): - with context as cassette: + with context: largs = list(args) # 1 - index largs.pop(1) @@ -204,7 +204,7 @@ def stubbed(*args, **kwargs): @six.wraps(f) def original(*args): - with context as cassette: + with context: return f(*args) return stubbed if len(cs) > 0 else original diff --git a/tests/unit/test_crypto.py b/tests/unit/test_crypto.py index f77101cc..cb6891a0 100644 --- a/tests/unit/test_crypto.py +++ b/tests/unit/test_crypto.py @@ -1,4 +1,3 @@ -import json import unittest from pubnub import crypto @@ -25,4 +24,4 @@ def test_vc_body_decoder(self): input = b'"9P/7+NNs54o7Go41yh+3rIn8BW0H0ad+mKlKTKGw2i1eoQP1ddHrnIzkRUPEC3ko"' # print(json.loads(input.decode('utf-8'))) assert {"name": "Alex", "online": True} == \ - gen_decrypt_func('testKey')(input.decode('utf-8')) + gen_decrypt_func('testKey')(input.decode('utf-8')) diff --git a/tests/unit/test_herenow.py b/tests/unit/test_herenow.py index 2e0aa7c7..f2c307dc 100644 --- a/tests/unit/test_herenow.py +++ b/tests/unit/test_herenow.py @@ -16,7 +16,7 @@ multiple = {'status': 200, 'message': 'OK', 'payload': {'total_channels': 2, 'channels': { 'here-now-GIY92DGX': {'occupancy': 1, 'uuids': ['c71b2961-9624-4801-90bc-6c89a725a422']}, 'here-now-B1WZA4LO': {'occupancy': 1, 'uuids': ['c71b2961-9624-4801-90bc-6c89a725a422']}}, 'total_occupancy': 2}, - 'service': 'Presence'} + 'service': 'Presence'} multiple_disable_uuids = { 'payload': {'channels': {'here-now-IUX5HV7O': {'occupancy': 1}, 'here-now-FGE5Q9UY': {'occupancy': 1}}, 'total_occupancy': 2, 'total_channels': 2}, 'message': 'OK', 'service': 'Presence', 'status': 200} diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index cb4ce3ad..2a94d3e8 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -2,6 +2,7 @@ from pubnub import utils from pubnub.utils import build_url + try: from urllib.parse import urlparse except ImportError: @@ -46,12 +47,12 @@ def match(expected_str, actual_str): self.assertEqual(parse_qs(expected.query), parse_qs(actual.query)) match("http://ex.com/news?a=2&b=qwer", - build_url("http", "ex.com", "/news", "a=2&b=qwer")) + build_url("http", "ex.com", "/news", "a=2&b=qwer")) match("https://ex.com/?a=2&b=qwer", - build_url("https", "ex.com", "/", "a=2&b=qwer")) + build_url("https", "ex.com", "/", "a=2&b=qwer")) -class TestBuildUrl(unittest.TestCase): +class TestJoin(unittest.TestCase): def test_join_items_and_encode(self): assert "a%2Fb,c%20d" == utils.join_items_and_encode(['a/b', 'c d']) @@ -71,7 +72,7 @@ def test_sign_sha_256(self): input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 grant -channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.0&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.0&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) assert "Dq92jnwRTCikdeP2nUs1__gyJthF8NChwbs5aYy2r_I=" == result diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index d40ae774..eab52ae9 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -14,8 +14,10 @@ def test_string_list_in_path_matcher(self): r1 = Request('/v2/presence/sub-key/my_sub_key/channel/ch1,ch2') r2 = Request('/v2/presence/sub-key/my_sub_key/channel/ch2,ch1') r3 = Request('/v2/presence/sub-key/my_sub_key/channel/ch2,ch3') - r4 = Request('/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0') - r5 = Request('/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0') + r4 = Request( + '/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0') # noqa: E501 + r5 = Request( + '/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0') # noqa: E501 assert string_list_in_path_matcher(r1, r2, 6) assert not string_list_in_path_matcher(r2, r3, 6) @@ -23,8 +25,12 @@ def test_string_list_in_path_matcher(self): assert not string_list_in_path_matcher(r4, r5) def test_string_list_in_path_query_matcher(self): - r1 = Request(query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) - r2 = Request(query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) + r1 = Request( + query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), + ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) + r2 = Request( + query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), + ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) assert string_list_in_query_matcher(r1, r2, ['channel']) assert not string_list_in_query_matcher(r1, r2) From 43419f546633272241c6c9bb9391fbfd013f9f51 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 06:36:12 -0700 Subject: [PATCH 316/468] Add flake8 runner --- scripts/run-tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index e874267f..16727173 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -22,6 +22,8 @@ def run(command): return check_call(command, shell=True) +if not version.startswith('2.6'): + run('flake8') if version.startswith('2.6'): run( From 4e8644413822a01c7ff294757d52c8d34ef95f00 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 13:30:01 -0700 Subject: [PATCH 317/468] Reconfigure flake8 --- pubnub/pubnub_tornado.py | 2 +- scripts/run-tests.py | 26 ++++++++++++++++---------- setup.cfg | 1 - tests/integrational/vcr_helper.py | 4 ++-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index eaa5b832..711fea24 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -372,7 +372,7 @@ def _perform_heartbeat_loop(self): if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) - except PubNubTornadoException as e: + except PubNubTornadoException: pass # TODO: check correctness # if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 16727173..5aac40c6 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -14,7 +14,9 @@ pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) -cmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/integrational/twisted ' +tcmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/integrational/twisted ' +fcmn = 'flake8 --exclude=src/,.cache,.git,.idea,.tox,._trial_temp/' + print("Version is", version) @@ -22,24 +24,28 @@ def run(command): return check_call(command, shell=True) -if not version.startswith('2.6'): - run('flake8') if version.startswith('2.6'): run( - '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) # noqa: E501 + '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 elif version.startswith('2.7'): # TODO: remove twisted ignore option when the tests will be ready - run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) + run("%s,*asyncio*,*python_v35*" % fcmn) + run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.3'): - run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) + run("%s,*asyncio*,*python_v35*" % fcmn) + run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.4'): - run('%s--ignore=tests/integrational/python_v35/ ' % cmn) + run("%s,*python_v35*" % fcmn) + run('%s--ignore=tests/integrational/python_v35/ ' % tcmn) elif version.startswith('3.5'): - run(cmn) + run(fcmn) + run(tcmn) elif version.startswith('3.6'): - run(cmn) + run(fcmn) + run(tcmn) elif version.startswith('pypy'): - run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % cmn) + run("%s,*asyncio*,*python_v35*" % fcmn) + run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) else: raise Exception("Version %s is not supported by this script runner" % version) diff --git a/setup.cfg b/setup.cfg index 981dc80c..c43582b6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -3,5 +3,4 @@ norecursedirs = benchmarks [flake8] max-line-length = 120 -exclude=src/,.cache,.git,.idea,.tox,._trial_temp/ ignore=E402 \ No newline at end of file diff --git a/tests/integrational/vcr_helper.py b/tests/integrational/vcr_helper.py index 391ca9cb..8c8017a5 100644 --- a/tests/integrational/vcr_helper.py +++ b/tests/integrational/vcr_helper.py @@ -56,7 +56,7 @@ def object_in_path_matcher(r1, r2, decrypter=None): else: assert v == path2[k] - except AssertionError as e: + except AssertionError: return False return True @@ -69,7 +69,7 @@ def object_in_body_matcher(r1, r2, decrypter=None): else: assert json.loads(url_decode(r1.body.decode('utf-8'))) == json.loads(url_decode(r2.body.decode('utf-8'))) - except AssertionError as e: + except AssertionError: return False return True From a1e4a296d7a54f0beebeb4c81ee01b994ec200eb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 13:42:18 -0700 Subject: [PATCH 318/468] Add python 3.6.x buld --- .travis.yml | 1 + requirements36-dev.txt | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 requirements36-dev.txt diff --git a/.travis.yml b/.travis.yml index 41f5baca..4c2e9c6d 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - "3.3" - "3.4.4" - "3.5" + - "3.6" - "pypy" sudo: false install: diff --git a/requirements36-dev.txt b/requirements36-dev.txt new file mode 100644 index 00000000..ab43cbd2 --- /dev/null +++ b/requirements36-dev.txt @@ -0,0 +1,5 @@ +pytest-asyncio +tornado +aiohttp +flake8 +-e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.5.egg From 7c8dba87c1edf71bc7ffe3154b3783297d650074 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 13:46:57 -0700 Subject: [PATCH 319/468] Fix 3.6 travis name --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4c2e9c6d..94dc2c78 100755 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ python: - "3.3" - "3.4.4" - "3.5" - - "3.6" + - "nightly" - "pypy" sudo: false install: From ff6f45ee8b990a2997d3bc459adfb7921d8405aa Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 13:54:58 -0700 Subject: [PATCH 320/468] Fix nightly tests runner --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 5aac40c6..5d367875 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -41,7 +41,7 @@ def run(command): elif version.startswith('3.5'): run(fcmn) run(tcmn) -elif version.startswith('3.6'): +elif version.startswith('3.6') or version is 'nightly': run(fcmn) run(tcmn) elif version.startswith('pypy'): From e0f41bcae1b1d4b0623a67321d545c5b8603170e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 14:04:38 -0700 Subject: [PATCH 321/468] Fix nightly tests runner --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 5d367875..87fe3cf5 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -41,7 +41,7 @@ def run(command): elif version.startswith('3.5'): run(fcmn) run(tcmn) -elif version.startswith('3.6') or version is 'nightly': +elif version.startswith('3.6') or version == 'nightly': run(fcmn) run(tcmn) elif version.startswith('pypy'): From 066566a76603f7bec094a8676cd76802a8f1e14b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 14:09:56 -0700 Subject: [PATCH 322/468] Add python 3.6 tests installer --- scripts/install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/install.sh b/scripts/install.sh index afc7baac..df15e6ca 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -6,4 +6,6 @@ if [[ $TRAVIS_PYTHON_VERSION == 2.7 ]]; then pip install -r requirements27-dev.t if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install -r requirements33-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.4.4 ]]; then pip install -r requirements34-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then pip install -r requirements36-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == "nigthly" ]]; then pip install -r requirements36-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == "pypy" ]]; then pip install -r requirements-pypy-dev.txt; fi From 5b0a0ffcc6ee06e9495ccb7022f3a181a127ab3b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 14:14:32 -0700 Subject: [PATCH 323/468] Fix typo --- scripts/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install.sh b/scripts/install.sh index df15e6ca..eee25dd9 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -7,5 +7,5 @@ if [[ $TRAVIS_PYTHON_VERSION == 3.3 ]]; then pip install -r requirements33-dev.t if [[ $TRAVIS_PYTHON_VERSION == 3.4.4 ]]; then pip install -r requirements34-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.5 ]]; then pip install -r requirements35-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == 3.6 ]]; then pip install -r requirements36-dev.txt; fi -if [[ $TRAVIS_PYTHON_VERSION == "nigthly" ]]; then pip install -r requirements36-dev.txt; fi +if [[ $TRAVIS_PYTHON_VERSION == "nightly" ]]; then pip install -r requirements36-dev.txt; fi if [[ $TRAVIS_PYTHON_VERSION == "pypy" ]]; then pip install -r requirements-pypy-dev.txt; fi From 806ef3b61ff0560fe07be1e86f90fac9501822a0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 5 Sep 2016 14:20:42 -0700 Subject: [PATCH 324/468] Add flake8 to pypy --- requirements-pypy-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt index 9530794f..f9ff90dd 100644 --- a/requirements-pypy-dev.txt +++ b/requirements-pypy-dev.txt @@ -1,2 +1,3 @@ tornado +flake8 -e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-pypy.egg From a29ca3556e4957708193f9f5039669c7095f2b54 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 8 Sep 2016 02:55:31 -0700 Subject: [PATCH 325/468] Add missing remove_listener method --- pubnub/managers.py | 3 +++ pubnub/models/subscription_item.py | 3 +++ pubnub/pubnub.py | 14 ++++++++++++-- pubnub/pubnub_asyncio.py | 7 +++++++ pubnub/pubnub_tornado.py | 8 ++++++++ 5 files changed, 33 insertions(+), 2 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index 09904d88..303602bb 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -192,6 +192,9 @@ def _send_leave(self, unsubscribe_operation): def add_listener(self, listener): self._listener_manager.add_listener(listener) + def remove_listener(self, listener): + self._listener_manager.remove_listener(listener) + def adapt_subscribe_builder(self, subscribe_operation): assert isinstance(subscribe_operation, SubscribeOperation) self._subscription_state.adapt_subscribe_builder(subscribe_operation) diff --git a/pubnub/models/subscription_item.py b/pubnub/models/subscription_item.py index ec59e586..4b2bde92 100644 --- a/pubnub/models/subscription_item.py +++ b/pubnub/models/subscription_item.py @@ -2,3 +2,6 @@ class SubscriptionItem(object): def __init__(self, name=None, state=None): self.name = name self.state = state + + def __str__(self): + return self.name diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 96d46f34..26569ab2 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -73,8 +73,18 @@ def request_future(self, *args, **kwargs): raise NotImplementedError def add_listener(self, listener): - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.add_listener(listener) + if self._subscription_manager is not None: + assert isinstance(listener, SubscribeCallback) + self._subscription_manager.add_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + + def remove_listener(self, listener): + if self._subscription_manager is not None: + assert isinstance(listener, SubscribeCallback) + self._subscription_manager.remove_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") class NativePublishSequenceManager(PublishSequenceManager): diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 43d234bf..10a24927 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -64,6 +64,13 @@ def add_listener(self, listener): else: raise Exception("Subscription manager is not enabled for this instance") + def remove_listener(self, listener): + if self._subscription_manager is not None: + assert isinstance(listener, SubscribeCallback) + self._subscription_manager.remove_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + def request_sync(self, *args): raise NotImplementedError diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 711fea24..1d9ccbd2 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -77,10 +77,18 @@ def __init__(self, config, custom_ioloop=None): def add_listener(self, listener): if self._subscription_manager is not None: + assert isinstance(listener, SubscribeCallback) self._subscription_manager.add_listener(listener) else: raise Exception("Subscription manager is not enabled for this instance") + def remove_listener(self, listener): + if self._subscription_manager is not None: + assert isinstance(listener, SubscribeCallback) + self._subscription_manager.remove_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + def request_sync(self, *args): raise NotImplementedError From 29a054ba48c9696838dd8fa83f2bf7e9be09172f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 8 Sep 2016 03:07:38 -0700 Subject: [PATCH 326/468] Move add/remove listener methods to pubnub_core --- pubnub/pubnub.py | 14 -------------- pubnub/pubnub_asyncio.py | 14 -------------- pubnub/pubnub_core.py | 12 ++++++++++++ pubnub/pubnub_tornado.py | 14 -------------- 4 files changed, 12 insertions(+), 42 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 26569ab2..9ea5a6ba 100755 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -72,20 +72,6 @@ def request_deferred(self, options_func): def request_future(self, *args, **kwargs): raise NotImplementedError - def add_listener(self, listener): - if self._subscription_manager is not None: - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.add_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") - - def remove_listener(self, listener): - if self._subscription_manager is not None: - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.remove_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") - class NativePublishSequenceManager(PublishSequenceManager): def __init__(self, provided_max_sequence): diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 10a24927..35079576 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -57,20 +57,6 @@ def stop(self): def sdk_platform(self): return "-Asyncio" - def add_listener(self, listener): - if self._subscription_manager is not None: - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.add_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") - - def remove_listener(self, listener): - if self._subscription_manager is not None: - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.remove_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") - def request_sync(self, *args): raise NotImplementedError diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index d1342f6e..ba7349e8 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -65,6 +65,18 @@ def sdk_platform(self): def uuid(self): return self.config.uuid + def add_listener(self, listener): + if self._subscription_manager is not None: + self._subscription_manager.add_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + + def remove_listener(self, listener): + if self._subscription_manager is not None: + self._subscription_manager.remove_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") + def add_channel_to_channel_group(self): return AddChannelToChannelGroup(self) diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 1d9ccbd2..d7cc7c09 100755 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -75,20 +75,6 @@ def __init__(self, config, custom_ioloop=None): 'Accept-Encoding': 'utf-8' } - def add_listener(self, listener): - if self._subscription_manager is not None: - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.add_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") - - def remove_listener(self, listener): - if self._subscription_manager is not None: - assert isinstance(listener, SubscribeCallback) - self._subscription_manager.remove_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") - def request_sync(self, *args): raise NotImplementedError From 483e0d559e1be246c687b63d01520919fdbc7fc8 Mon Sep 17 00:00:00 2001 From: crimsonred Date: Thu, 8 Sep 2016 16:10:53 +0530 Subject: [PATCH 327/468] Updating feature matrix --- .pubnub.yml | 53 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 294eafe7..999c5404 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -104,24 +104,43 @@ changelog: text: New method signatures -- be sure to check migration doc if upgrading. features: access: - - GRANT + - ACCESS-GRANT channel-groups: - - ADD-CHANNELS - - REMOVE-CHANNELS - - LIST-GROUPS - - LIST-CHANNELS-IN-GROUP + - CHANNEL-GROUPS-ADD-CHANNELS + - CHANNEL-GROUPS-REMOVE-CHANNELS + - CHANNEL-GROUPS-LIST-GROUPS + - CHANNEL-GROUPS-LIST-CHANNELS-IN-GROUP push: - - ADD-DEVICE-TO-CHANNELS - - REMOVE-DEVICE-FROM-CHANNELS - - LIST-CHANNELS-FROM-DEVICE - - REMOVE-DEVICE + - PUSH-ADD-DEVICE-TO-CHANNELS + - PUSH-REMOVE-DEVICE-FROM-CHANNELS + - PUSH-LIST-CHANNELS-FROM-DEVICE + - PUSH-REMOVE-DEVICE presence: - - HERE-NOW - - WHERE-NOW - - SET-STATE - - GET-STATE - - HEARTBEAT + - PRESENCE-HERE-NOW + - PRESENCE-WHERE-NOW + - PRESENCE-SET-STATE + - PRESENCE-GET-STATE + - PRESENCE-HEARTBEAT publish: - - STORE-FLAG - - FIRE - - REPLICATION-FLAG + - PUBLISH-STORE-FLAG + - PUBLISH-RAW-JSON + - PUBLISH-WITH-METADATA + - PUBLISH-GET + - PUBLISH-POST + - PUBLISH-ASYNC + - PUBLISH-FIRE + - PUBLISH-REPLICATION-FLAG + storage: + - STORAGE-REVERSE + - STORAGE-INCLUDE-TIMETOKEN + - STORAGE-START-END + - STORAGE-COUNT + time: + - TIME-TIME + subscribe: + - SUBSCRIBE-CHANNELS + - SUBSCRIBE-CHANNEL-GROUPS + - SUBSCRIBE-PRESENCE-CHANNELS + - SUBSCRIBE-PRESENCE-CHANNELS-GROUPS + - SUBSCRIBE-WITH-TIMETOKEN + - SUBSCRIBE-WILDCARD From 6c48e744fb98a72a1034000b4a76684f23b2978f Mon Sep 17 00:00:00 2001 From: crimsonred Date: Thu, 8 Sep 2016 16:11:41 +0530 Subject: [PATCH 328/468] Updating feature matrix --- .pubnub.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 999c5404..19a23ffc 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -128,8 +128,6 @@ features: - PUBLISH-GET - PUBLISH-POST - PUBLISH-ASYNC - - PUBLISH-FIRE - - PUBLISH-REPLICATION-FLAG storage: - STORAGE-REVERSE - STORAGE-INCLUDE-TIMETOKEN From 47c92745e7b11e6b1363d2ddf6d73eabea89006a Mon Sep 17 00:00:00 2001 From: crimsonred Date: Thu, 8 Sep 2016 16:14:45 +0530 Subject: [PATCH 329/468] Updating feature matrix --- .pubnub.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.pubnub.yml b/.pubnub.yml index 19a23ffc..244927ee 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -126,7 +126,6 @@ features: - PUBLISH-RAW-JSON - PUBLISH-WITH-METADATA - PUBLISH-GET - - PUBLISH-POST - PUBLISH-ASYNC storage: - STORAGE-REVERSE From df81802805517d06c5a2f748f2aba42f672ac0eb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 8 Sep 2016 08:00:31 -0700 Subject: [PATCH 330/468] Add get_subscribed_channels() and get_subscribed_channel_groups() methods --- pubnub/managers.py | 6 ++++ pubnub/pubnub_core.py | 28 +++++++++++++------ tests/integrational/asyncio/test_subscribe.py | 10 +++++++ .../native_threads/test_subscribe.py | 11 ++++++++ tests/integrational/tornado/test_subscribe.py | 11 ++++++++ 5 files changed, 58 insertions(+), 8 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index 303602bb..32a504fc 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -195,6 +195,12 @@ def add_listener(self, listener): def remove_listener(self, listener): self._listener_manager.remove_listener(listener) + def get_subscribed_channels(self): + return self._subscription_state.prepare_channel_list(False) + + def get_subscribed_channel_groups(self): + return self._subscription_state.prepare_channel_group_list(False) + def adapt_subscribe_builder(self, subscribe_operation): assert isinstance(subscribe_operation, SubscribeOperation) self._subscription_state.adapt_subscribe_builder(subscribe_operation) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index ba7349e8..74e2d17a 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -66,16 +66,24 @@ def uuid(self): return self.config.uuid def add_listener(self, listener): - if self._subscription_manager is not None: - self._subscription_manager.add_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") + self._validate_subscribe_manager_enabled() + + return self._subscription_manager.add_listener(listener) def remove_listener(self, listener): - if self._subscription_manager is not None: - self._subscription_manager.remove_listener(listener) - else: - raise Exception("Subscription manager is not enabled for this instance") + self._validate_subscribe_manager_enabled() + + return self._subscription_manager.remove_listener(listener) + + def get_subscribed_channels(self): + self._validate_subscribe_manager_enabled() + + return self._subscription_manager.get_subscribed_channels() + + def get_subscribed_channel_groups(self): + self._validate_subscribe_manager_enabled() + + return self._subscription_manager.get_subscribed_channel_groups() def add_channel_to_channel_group(self): return AddChannelToChannelGroup(self) @@ -141,3 +149,7 @@ def time(self): @staticmethod def timestamp(): return int(time.time()) + + def _validate_subscribe_manager_enabled(self): + if self._subscription_manager is None: + raise Exception("Subscription manager is not enabled for this instance") \ No newline at end of file diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 5353ebfc..ce0b1697 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -22,12 +22,22 @@ def test_subscribe_unsubscribe(event_loop): callback = SubscribeListener() pubnub.add_listener(callback) + pubnub.subscribe().channels(channel).execute() + assert channel in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 1 yield from callback.wait_for_connect() + assert channel in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 1 pubnub.unsubscribe().channels(channel).execute() + assert channel not in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 0 + yield from callback.wait_for_disconnect() + assert channel not in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 0 pubnub.stop() diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index e84b6ad1..764cffac 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -24,10 +24,21 @@ def test_subscribe_unsubscribe(self): pubnub.add_listener(listener) pubnub.subscribe().channels(ch).execute() + assert ch in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 1 + listener.wait_for_connect() + assert ch in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 1 pubnub.unsubscribe().channels(ch).execute() + assert ch not in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 0 + listener.wait_for_disconnect() + assert ch not in pubnub.get_subscribed_channels() + assert len(pubnub.get_subscribed_channels()) == 0 + except PubNubException as e: self.fail(e) finally: diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index c12282ae..65fc88e1 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -34,11 +34,22 @@ def test_subscribe_unsubscribe(self): callback_messages = SubscribeListener() self.pubnub.add_listener(callback_messages) + self.pubnub.subscribe().channels(ch).execute() + assert ch in self.pubnub.get_subscribed_channels() + assert len(self.pubnub.get_subscribed_channels()) == 1 + yield callback_messages.wait_for_connect() + assert ch in self.pubnub.get_subscribed_channels() + assert len(self.pubnub.get_subscribed_channels()) == 1 self.pubnub.unsubscribe().channels(ch).execute() + assert ch not in self.pubnub.get_subscribed_channels() + assert len(self.pubnub.get_subscribed_channels()) == 0 + yield callback_messages.wait_for_disconnect() + assert ch not in self.pubnub.get_subscribed_channels() + assert len(self.pubnub.get_subscribed_channels()) == 0 self.pubnub.stop() self.stop() From 4ea4a17b7e195c0088603fc75dcfd827397a8d23 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 8 Sep 2016 08:06:05 -0700 Subject: [PATCH 331/468] Fix new line --- pubnub/pubnub_core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 74e2d17a..b4e3dc56 100755 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -152,4 +152,4 @@ def timestamp(): def _validate_subscribe_manager_enabled(self): if self._subscription_manager is None: - raise Exception("Subscription manager is not enabled for this instance") \ No newline at end of file + raise Exception("Subscription manager is not enabled for this instance") From 646d7fc41d45e0e1da5d10a2d3376b683b8d9b79 Mon Sep 17 00:00:00 2001 From: crimsonred Date: Thu, 8 Sep 2016 21:23:57 +0530 Subject: [PATCH 332/468] Added remove CG --- .pubnub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pubnub.yml b/.pubnub.yml index 244927ee..142d3927 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -108,7 +108,7 @@ features: channel-groups: - CHANNEL-GROUPS-ADD-CHANNELS - CHANNEL-GROUPS-REMOVE-CHANNELS - - CHANNEL-GROUPS-LIST-GROUPS + - CHANNEL-GROUPS-REMOVE-GROUPS - CHANNEL-GROUPS-LIST-CHANNELS-IN-GROUP push: - PUSH-ADD-DEVICE-TO-CHANNELS From 211ed20ee526dc9b0e95e5f98de895f8c095b392 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 12 Sep 2016 11:18:18 -0700 Subject: [PATCH 333/468] Update Tornado Demo API App --- examples/tornado/http/app.py | 203 +++++++++++++++++++++++++------ examples/tornado/http/index.html | 17 --- 2 files changed, 164 insertions(+), 56 deletions(-) delete mode 100644 examples/tornado/http/index.html diff --git a/examples/tornado/http/app.py b/examples/tornado/http/app.py index f031d8ea..63836825 100644 --- a/examples/tornado/http/app.py +++ b/examples/tornado/http/app.py @@ -1,24 +1,31 @@ +import json import tornado.ioloop import tornado.web import tornado.gen import sys import os +from pubnub.enums import PNStatusCategory, PNOperationType + d = os.path.dirname PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) +APP_ROOT = d(os.path.abspath(__file__)) sys.path.append(PUBNUB_ROOT) -from pubnub.pubnub_tornado import SubscribeListener +from pubnub.pubnub_tornado import SubscribeListener, TornadoEnvelope from pubnub.exceptions import PubNubException from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_tornado import PubNubTornado, PubNubTornadoException - +from pubnub.pubnub_tornado import SubscribeCallback +from pubnub.models.consumer.pubsub import PNPublishResult pnconf = PNConfiguration() -pnconf.subscribe_key = "demo" -pnconf.publish_key = "demo" -channel = "my_channel" +pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconf.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" +pnconf.uuid = "pubnub-demo-api-python-backend" +DEFAULT_CHANNEL = "pubnub_demo_api_python_channel" +EVENTS_CHANNEL = "pubnub_demo_api_python_events" pubnub = PubNubTornado(pnconf) @@ -32,86 +39,204 @@ def get(self): self.render("index.html") -class AsyncHandler(tornado.web.RequestHandler): +class SyncPublishHandler(tornado.web.RequestHandler): + @tornado.gen.coroutine + def get(self): + return self.send_error(501, message={ + "error": "Sync publish not implemented" + }) + + +class AsyncPublishHandler(tornado.web.RequestHandler): + @tornado.gen.coroutine + def get(self): + try: + envelope = yield pubnub.publish().channel(DEFAULT_CHANNEL).message("hello from yield-based publish").future() + self.write(json.dumps({ + "original_response": str(envelope.status.original_response) + })) + except PubNubTornadoException as e: + self.send_error(500, message={ + "message": str(e) + }) + + +class AsyncPublishHandler2(tornado.web.RequestHandler): def data_received(self, chunk): pass @tornado.web.asynchronous def get(self): - pubnub.publish().channel(channel).message("hello from callback-based publish")\ + pubnub.publish().channel(DEFAULT_CHANNEL).message("hello from callback-based publish")\ .future().add_done_callback(self.callback) def callback(self, future): if future.exception() is not None: - self.set_status(500) - self.write("Something went wrong:" + str(future.exception())) + self.send_error(500, message={ + "message": str(str(future.exception())) + }) else: envelope = future.result() - self.write("success/") - self.write(str(envelope.status.original_response)) + self.write(json.dumps({ + "original_response": str(envelope.status.original_response) + })) self.finish() -class YieldHandler(tornado.web.RequestHandler): +class ListenHandler(tornado.web.RequestHandler): + """ + Long-polling request + """ + def data_received(self, chunk): + pass + @tornado.gen.coroutine def get(self): + self.set_header('Content-Type', 'application/json') + + channel = self.get_argument('channel') + if channel is None: + return self.send_error(500, message={ + "error": "Channel missing" + }) + + listener = SubscribeListener() + pubnub.add_listener(listener) + try: - envelope = yield pubnub.publish().channel(channel).message("hello from yield-based publish").future() - self.write(str(envelope.status.original_response)) - except PubNubTornadoException as e: - self.set_status(500) - self.write(str(e)) + res = yield listener.wait_for_message_on(channel) + self.write(json.dumps({"message": res.message})) + except PubNubException as e: + self.send_error(500, message={ + "message": str(e) + }) + finally: + pubnub.remove_listener(listener) -class UnsubscribeHandler(tornado.web.RequestHandler): +class ListChannelHandler(tornado.web.RequestHandler): def data_received(self, chunk): pass @tornado.gen.coroutine def get(self): - listener = SubscribeListener() - pubnub.add_listener(listener) + self.set_header('Content-Type', 'application/json') + + self.write(json.dumps({ + "subscribed_channels": pubnub.get_subscribed_channels() + })) + + +class AddChannelHandler(tornado.web.RequestHandler): + def data_received(self, chunk): + pass + + @tornado.gen.coroutine + def get(self): + self.set_header('Content-Type', 'application/json') + + channel = self.get_argument('channel') + if channel is None: + return self.send_error(500, message={ + "error": "Channel missing" + }) try: - pubnub.unsubscribe().channels(channel).execute() - yield listener.wait_for_disconnect() - self.write("unsubscribed from %s" % channel) + pubnub.subscribe().channels(channel).execute() + self.write(json.dumps({ + "subscribed_channels": pubnub.get_subscribed_channels() + })) except PubNubException as e: - self.write(str(e)) + self.send_error(500, message={ + "message": str(e) + }) -class SubscribeHandler(tornado.web.RequestHandler): +class RemoveChannelHandler(tornado.web.RequestHandler): def data_received(self, chunk): pass @tornado.gen.coroutine def get(self): - listener = SubscribeListener() - pubnub.add_listener(listener) + self.set_header('Content-Type', 'application/json') + + channel = self.get_argument('channel') + if channel is None: + return self.send_error(500, message={ + "error": "Channel missing" + }) try: - pubnub.subscribe().channels(channel).execute() - yield listener.wait_for_connect() - res = yield listener.wait_for_message_on(channel) pubnub.unsubscribe().channels(channel).execute() - yield listener.wait_for_disconnect() - self.write(str(res.message)) - + self.write(json.dumps({ + "subscribed_channels": pubnub.get_subscribed_channels() + })) except PubNubException as e: - self.write(str(e)) + self.send_error(500, message={ + "message": str(e) + }) + + +def init_events_transmitter(): + """ + Method transmits status events to the specific channel + :return: + """ + class StatusListener(SubscribeCallback): + def status(self, pubnub, status): + def callback(future): + envelope = future.result() + assert isinstance(envelope, TornadoEnvelope) + + result = envelope.result + assert isinstance(result, PNPublishResult) + + print(result) + + event = "unknown" + + if status.operation == PNOperationType.PNSubscribeOperation \ + and status.category == PNStatusCategory.PNConnectedCategory: + event = "subscribed" + elif status.operation == PNOperationType.PNUnsubscribeOperation \ + and status.category == PNStatusCategory.PNAcknowledgmentCategory: + event = "unsubscribed" + + tornado.ioloop.IOLoop.current().add_future( + pubnub.publish().channel(EVENTS_CHANNEL).message({ + "event": event + }).future(), + callback + ) + + def presence(self, pubnub, presence): + pass + + def message(self, pubnub, message): + pass + + listener = StatusListener() + pubnub.add_listener(listener) def make_app(): return tornado.web.Application([ (r"/", MainHandler), - (r"/publish_callback", AsyncHandler), - (r"/publish_yield", YieldHandler), - (r"/subscribe", SubscribeHandler), - (r"/unsubscribe", UnsubscribeHandler), - ]) + (r"/listen", ListenHandler), + (r"/publish/sync", SyncPublishHandler), + (r"/publish/async", AsyncPublishHandler), + (r"/publish/async2", AsyncPublishHandler2), + (r"/subscription/list", ListChannelHandler), + (r"/subscription/add", AddChannelHandler), + (r"/subscription/remove", RemoveChannelHandler), + ], + static_path=os.path.join(APP_ROOT, "static"), + template_path=os.path.join(APP_ROOT, "templates"),) + if __name__ == "__main__": + init_events_transmitter() app = make_app() app.listen(8888) tornado.ioloop.IOLoop.current().start() diff --git a/examples/tornado/http/index.html b/examples/tornado/http/index.html deleted file mode 100644 index 58e17f5c..00000000 --- a/examples/tornado/http/index.html +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - PubNub Tornado Subscribe/Unsubscribe Example - - -

      Select an action:

      -/subscribe
      -/unsubscribe
      -/publish_yield
      -/publish_callback - - \ No newline at end of file From e4d6e2c63d860311beabe45b7dc46db0cebd8cd8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 12 Sep 2016 11:30:57 -0700 Subject: [PATCH 334/468] Add Tornado Demo API App config files --- examples/tornado/http/Procfile | 1 + examples/tornado/http/requirements.txt | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 examples/tornado/http/Procfile create mode 100644 examples/tornado/http/requirements.txt diff --git a/examples/tornado/http/Procfile b/examples/tornado/http/Procfile new file mode 100644 index 00000000..2e35818f --- /dev/null +++ b/examples/tornado/http/Procfile @@ -0,0 +1 @@ +web: python app.py diff --git a/examples/tornado/http/requirements.txt b/examples/tornado/http/requirements.txt new file mode 100644 index 00000000..de466fb5 --- /dev/null +++ b/examples/tornado/http/requirements.txt @@ -0,0 +1,2 @@ +tornado +pubnub From 37f10529401270eb42fdcd32ffeb097c7a951e07 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 13 Sep 2016 10:00:50 -0700 Subject: [PATCH 335/468] Add unique key to Tornado demo app --- examples/tornado/http/app.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/examples/tornado/http/app.py b/examples/tornado/http/app.py index 63836825..8044c05c 100644 --- a/examples/tornado/http/app.py +++ b/examples/tornado/http/app.py @@ -5,6 +5,7 @@ import sys import os +from pubnub import utils from pubnub.enums import PNStatusCategory, PNOperationType d = os.path.dirname @@ -26,6 +27,7 @@ pnconf.uuid = "pubnub-demo-api-python-backend" DEFAULT_CHANNEL = "pubnub_demo_api_python_channel" EVENTS_CHANNEL = "pubnub_demo_api_python_events" +APP_KEY = utils.uuid() pubnub = PubNubTornado(pnconf) @@ -84,6 +86,19 @@ def callback(self, future): self.finish() +class AppKeyHandler(tornado.web.RequestHandler): + def data_received(self, chunk): + pass + + @tornado.gen.coroutine + def get(self): + self.set_header('Content-Type', 'application/json') + + self.write(json.dumps({ + "app_key": APP_KEY + })) + + class ListenHandler(tornado.web.RequestHandler): """ Long-polling request @@ -204,7 +219,7 @@ def callback(future): event = "unsubscribed" tornado.ioloop.IOLoop.current().add_future( - pubnub.publish().channel(EVENTS_CHANNEL).message({ + pubnub.publish().channel('status-' + APP_KEY).message({ "event": event }).future(), callback @@ -224,6 +239,7 @@ def make_app(): return tornado.web.Application([ (r"/", MainHandler), (r"/listen", ListenHandler), + (r"/app_key", AppKeyHandler), (r"/publish/sync", SyncPublishHandler), (r"/publish/async", AsyncPublishHandler), (r"/publish/async2", AsyncPublishHandler2), From 2a32673653bcbc1a518cecb9f9c01c77cb4290f5 Mon Sep 17 00:00:00 2001 From: Pelle van der Heide Date: Wed, 14 Sep 2016 14:59:10 +0200 Subject: [PATCH 336/468] Promote requests.session s to member of Pubnub This allow multiple instances to have a different behaviour. For example the user can now instantiate one instance with azure and one without azure, without conflicting adapters. --- pubnub.py | 64 ++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/pubnub.py b/pubnub.py index 0e28b096..92de455b 100755 --- a/pubnub.py +++ b/pubnub.py @@ -2584,26 +2584,6 @@ def init_poolmanager(self, *args, **kwargs): super(PubnubHTTPAdapter, self).init_poolmanager(*args, **kwargs) -s = requests.Session() -#s.mount('http://', PubnubHTTPAdapter(max_retries=1)) -#s.mount('https://', PubnubHTTPAdapter(max_retries=1)) -#s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) -#s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1)) - - -def _requests_request(url, timeout=15): - try: - resp = s.get(url, timeout=timeout) - except requests.exceptions.HTTPError as http_error: - resp = http_error - except requests.exceptions.ConnectionError as error: - msg = str(error) - return (json.dumps(msg), 0) - except requests.exceptions.Timeout as error: - msg = str(error) - return (json.dumps(msg), 0) - return (resp.text, resp.status_code) - def _urllib_request_3(url, timeout=15): try: @@ -2613,8 +2593,6 @@ def _urllib_request_3(url, timeout=15): r = resp.read().decode("utf-8") return (r, resp.code) -_urllib_request = None - # Pubnub @@ -2647,40 +2625,52 @@ def __init__( _channel_list_lock=threading.RLock(), _channel_group_list_lock=threading.RLock() ) - global _urllib_request + if self.python_version == 2: - _urllib_request = _urllib_request_2 + self._urllib_request = _urllib_request_2 else: - _urllib_request = _urllib_request_3 + self._urllib_request = _urllib_request_3 if pooling is True: - _urllib_request = _requests_request + self._urllib_request = self._requests_request self.latest_sub_callback_lock = threading.RLock() self.latest_sub_callback = {'id': None, 'callback': None} self.pnsdk = 'PubNub-Python' + '/' + self.version self.daemon = daemon + self.session = requests.Session() + if azure is False: - s.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) - s.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) else: - s.mount('http://', PubnubHTTPAdapter(max_retries=1, pool_maxsize=500)) - s.mount('https://', PubnubHTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('http://', PubnubHTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('https://', PubnubHTTPAdapter(max_retries=1, pool_maxsize=500)) def timeout(self, interval, func1, *argv): timer = Timer(interval, func1, False, *argv) timer.start() - return timer.cancel + def _requests_request(self, url, timeout=15): + try: + resp = self.session.get(url, timeout=timeout) + except requests.exceptions.HTTPError as http_error: + resp = http_error + except requests.exceptions.ConnectionError as error: + msg = str(error) + return (json.dumps(msg), 0) + except requests.exceptions.Timeout as error: + msg = str(error) + return (json.dumps(msg), 0) + return (resp.text, resp.status_code) + def _request_async(self, url, callback=None, error=None, single=False, timeout=15): - global _urllib_request - if single is True: id = time.time() - client = HTTPClient(self, url=url, urllib_func=_urllib_request, + client = HTTPClient(self, url=url, urllib_func=self._urllib_request, callback=None, error=None, id=id, timeout=timeout) with self.latest_sub_callback_lock: @@ -2688,7 +2678,7 @@ def _request_async(self, url, callback=None, error=None, single=False, self.latest_sub_callback['callback'] = callback self.latest_sub_callback['error'] = error else: - client = HTTPClient(self, url=url, urllib_func=_urllib_request, + client = HTTPClient(self, url=url, urllib_func=self._urllib_request, callback=callback, error=error, timeout=timeout) @@ -2701,10 +2691,8 @@ def abort(): return abort def _request_sync(self, url, timeout=15): - global _urllib_request - ## Send Request Expecting JSONP Response - response = _urllib_request(url, timeout=timeout) + response = self._urllib_request(url, timeout=timeout) try: resp_json = json.loads(response[0]) except ValueError: From 736c096473e7534f485a58ce56ae9c3502208cbe Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 14 Sep 2016 08:45:14 -0700 Subject: [PATCH 337/468] Add Asyncio API Demo App; Update Tornado API Demo App --- examples/asyncio/__init__.py | 0 examples/asyncio/http/__init__.py | 0 examples/asyncio/http/app.py | 168 +++++++++++++++++++++++++ examples/asyncio/http/requirements.txt | 3 + examples/tornado/http/app.py | 30 ++--- 5 files changed, 187 insertions(+), 14 deletions(-) create mode 100644 examples/asyncio/__init__.py create mode 100644 examples/asyncio/http/__init__.py create mode 100644 examples/asyncio/http/app.py create mode 100644 examples/asyncio/http/requirements.txt diff --git a/examples/asyncio/__init__.py b/examples/asyncio/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/asyncio/http/__init__.py b/examples/asyncio/http/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/asyncio/http/app.py b/examples/asyncio/http/app.py new file mode 100644 index 00000000..0fa40890 --- /dev/null +++ b/examples/asyncio/http/app.py @@ -0,0 +1,168 @@ +import asyncio +import json + +import sys +import os + +import aiohttp_cors as aiohttp_cors +from aiohttp import web + +from pubnub import utils +from pubnub.callbacks import SubscribeCallback +from pubnub.enums import PNStatusCategory, PNOperationType +from pubnub.pubnub_asyncio import PubNubAsyncio + +d = os.path.dirname +PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) +APP_ROOT = d(os.path.abspath(__file__)) +sys.path.append(PUBNUB_ROOT) + + +from pubnub.exceptions import PubNubException +from pubnub.pnconfiguration import PNConfiguration + +pnconf = PNConfiguration() +pnconf.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconf.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" +pnconf.uuid = "pubnub-demo-api-python-backend" +DEFAULT_CHANNEL = "pubnub_demo_api_python_channel" +EVENTS_CHANNEL = "pubnub_demo_api_python_events" +APP_KEY = utils.uuid() + +loop = asyncio.get_event_loop() +pubnub = PubNubAsyncio(pnconf) + + +def publish_sync(): + return _not_implemented_error({ + "error": "Sync publish not implemented" + }) + + +def app_key_handler(): + return _ok({ + 'app_key': APP_KEY + }) + + +def list_channels_handler(): + return _ok({ + "subscribed_channels": pubnub.get_subscribed_channels() + }) + + +def add_channel_handler(request): + channel = request.GET['channel'] + + if channel is None: + return _internal_server_error({ + "error": "Channel missing" + }) + + try: + pubnub.subscribe().channels(channel).execute() + return _ok({ + "subscribed_channels": pubnub.get_subscribed_channels() + }) + except PubNubException as e: + return _internal_server_error({ + "message": str(e) + }) + + +def remove_channel_handler(request): + channel = request.GET['channel'] + + if channel is None: + return _internal_server_error({ + "error": "Channel missing" + }) + + try: + pubnub.unsubscribe().channels(channel).execute() + return _ok({ + "subscribed_channels": pubnub.get_subscribed_channels() + }) + except PubNubException as e: + return _internal_server_error({ + "message": str(e) + }) + + +def _ok(body): + return _prepare_response(body) + + +def _not_implemented_error(body): + return web.HTTPNotImplemented(body=json.dumps(body).encode('utf-8'), content_type='application/json') + + +def _internal_server_error(body): + return web.HTTPInternalServerError(body=json.dumps(body).encode('utf-8'), content_type='application/json') + + +def _prepare_response(body): + return web.Response(body=json.dumps(body).encode('utf-8'), content_type='application/json') + + +def init_events_transmitter(): + """ + Method transmits status events to the specific channel + :return: + """ + class StatusListener(SubscribeCallback): + def status(self, pubnub, status): + event = "unknown" + + if status.operation == PNOperationType.PNSubscribeOperation \ + and status.category == PNStatusCategory.PNConnectedCategory: + event = "Connect" + elif status.operation == PNOperationType.PNUnsubscribeOperation \ + and status.category == PNStatusCategory.PNAcknowledgmentCategory: + event = "Unsubscribe" + + asyncio.ensure_future(pubnub.publish().channel('status-' + APP_KEY).message({ + "event": event + }).future(), loop=loop) + + def presence(self, pubnub, presence): + pass + + def message(self, pubnub, message): + pass + + listener = StatusListener() + pubnub.add_listener(listener) + + +async def make_app(loop): + app = web.Application() + # (r"/listen", ListenHandler), + + cors = aiohttp_cors.setup(app, defaults={ + "*": aiohttp_cors.ResourceOptions( + allow_credentials=True, + expose_headers="*", + allow_headers="*", + ) + }) + + app.router.add_route('GET', '/app_key', app_key_handler) + app.router.add_route('GET', '/subscription/add', add_channel_handler) + app.router.add_route('GET', '/subscription/remove', remove_channel_handler) + app.router.add_route('GET', '/subscription/list', list_channels_handler) + app.router.add_route('GET', '/publish/sync', publish_sync) + app.router.add_route('GET', '/publish/async', publish_sync) + app.router.add_route('GET', '/publish/async2', publish_sync) + + for route in list(app.router.routes()): + cors.add(route) + + srv = await loop.create_server(app.make_handler(), '0.0.0.0', 8080) + return srv + + +if __name__ == "__main__": + init_events_transmitter() + loop.run_until_complete(make_app(loop)) + loop.run_forever() diff --git a/examples/asyncio/http/requirements.txt b/examples/asyncio/http/requirements.txt new file mode 100644 index 00000000..8d6dd462 --- /dev/null +++ b/examples/asyncio/http/requirements.txt @@ -0,0 +1,3 @@ +aiohttp +aiohttp_cors + diff --git a/examples/tornado/http/app.py b/examples/tornado/http/app.py index 8044c05c..6e8ce398 100644 --- a/examples/tornado/http/app.py +++ b/examples/tornado/http/app.py @@ -32,15 +32,6 @@ pubnub = PubNubTornado(pnconf) -class MainHandler(tornado.web.RequestHandler): - def data_received(self, chunk): - pass - - @tornado.web.asynchronous - def get(self): - self.render("index.html") - - class SyncPublishHandler(tornado.web.RequestHandler): @tornado.gen.coroutine def get(self): @@ -52,8 +43,14 @@ def get(self): class AsyncPublishHandler(tornado.web.RequestHandler): @tornado.gen.coroutine def get(self): + channel = self.get_argument('channel') + if channel is None: + return self.send_error(500, message={ + "error": "Channel missing" + }) + try: - envelope = yield pubnub.publish().channel(DEFAULT_CHANNEL).message("hello from yield-based publish").future() + envelope = yield pubnub.publish().channel(channel).message("hello from yield-based publish").future() self.write(json.dumps({ "original_response": str(envelope.status.original_response) })) @@ -69,7 +66,13 @@ def data_received(self, chunk): @tornado.web.asynchronous def get(self): - pubnub.publish().channel(DEFAULT_CHANNEL).message("hello from callback-based publish")\ + channel = self.get_argument('channel') + if channel is None: + return self.send_error(500, message={ + "error": "Channel missing" + }) + + pubnub.publish().channel(channel).message("hello from callback-based publish")\ .future().add_done_callback(self.callback) def callback(self, future): @@ -213,10 +216,10 @@ def callback(future): if status.operation == PNOperationType.PNSubscribeOperation \ and status.category == PNStatusCategory.PNConnectedCategory: - event = "subscribed" + event = "Connect" elif status.operation == PNOperationType.PNUnsubscribeOperation \ and status.category == PNStatusCategory.PNAcknowledgmentCategory: - event = "unsubscribed" + event = "Unsubscribe" tornado.ioloop.IOLoop.current().add_future( pubnub.publish().channel('status-' + APP_KEY).message({ @@ -237,7 +240,6 @@ def message(self, pubnub, message): def make_app(): return tornado.web.Application([ - (r"/", MainHandler), (r"/listen", ListenHandler), (r"/app_key", AppKeyHandler), (r"/publish/sync", SyncPublishHandler), From 42544b6f54dc21481241f825aabeeb76465d23f4 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 14 Sep 2016 12:40:48 -0700 Subject: [PATCH 338/468] 3.8.3 --- .pubnub.yml | 7 +- CHANGELOG | 65 --------------- CHANGELOG.md | 231 +++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- pubnub.py | 5 +- setup.py | 2 +- 6 files changed, 241 insertions(+), 71 deletions(-) delete mode 100644 CHANGELOG create mode 100644 CHANGELOG.md diff --git a/.pubnub.yml b/.pubnub.yml index 142d3927..8d4d653b 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 3.8.2 +version: 3.8.3 schema: 1 scm: github.com/pubnub/python changelog: + - version: v3.8.3 + date: + changes: + - type: improvement + text: Removing PubNub connection handling from using the global directive to allow multiple instances to run. - version: v3.8.2 date: changes: diff --git a/CHANGELOG b/CHANGELOG deleted file mode 100644 index 1d35d161..00000000 --- a/CHANGELOG +++ /dev/null @@ -1,65 +0,0 @@ - -3.8.2 -. Increasing maximum pool of connections and adjusting cryptodome package dependency. - -3.8.1 -. Fixing bug with state setting and subscribe confirmation. - -3.8.0 -. Mobile Gateway Functions. -. Here Now for channel groups -. no-rep, store and fire() - -3.7.7 - 02-10-2015 - 3012d7e -. Adding .stop() method for base python async operations to exit the listener - -3.7.6 - 02-10-2015 - 3012d7e -. fixed issues in receiving gzipped response for twisted -. fix for non reporting of dns lookup failure -. fix in time method - -3.7.5 - 12-08-2015 - 61f1adc -. increased timeout to 15 sec - -3.7.4 - 11-17-15 - 8a00782 -. added state and here_now -. added presence heartbeat support - -3.7.2 - 6-25-15 - ad89de8 -. fix for decryption bug in history API -. module name changed to pubnub ( it was Pubnub earlier ). - Developers need to do from pubnub import Pubnub, instead of from Pubnub import Pubnub now -. fixed method arguments bug for presence API -. subscribe_sync removed -. fix for issue where error callback not invoked for presence -. added state support in subscribe and here now -. fix for grant API with python 3 -. added include_token option to history - -3.7.0 - 1-12-14 - f20e5e2 -. Channel Groups functionality -. Added Python Echo Server example -. Added missing timeout keyword arg -. Bringing versioning up to standard (3.7) - -3.5.3 - 10-21-14 - dc617ed -. Added patch to handle quick net calls in Azure environments -. Presence fixes -. added daemon flag - -3.5.2 - 6-25-14 - 1f98c4 -. Added pnsdk URL param to each request -. Added grant/revoke/audit examples to README -. Fixed erroneous "Connected" error condition in console -. Can now pass init vars via the CL on console -. Fixed UI issue of bracket color on console -. Enable subscribing to "-pnpres" channel on console - -3.5.1 - 6-17-14 -. Added subscribe_sync method -. renamed pres_uuid argument for Pubnub constructor to uuid - -3.5.0 - 6-16-14 -New version! Complete re-write! -. Async subscribe allows for MX, unsubscribe calls -. New method signatures -- be sure to check migration doc if upgrading diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 00000000..af5c7156 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,231 @@ + +## [v3.8.3](https://github.com/pubnub/python/tree/v3.8.3) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.8.2...v3.8.3) + + +- ⭐Removing PubNub connection handling from using the global directive to allow multiple instances to run. + + + +## [v3.8.2](https://github.com/pubnub/python/tree/v3.8.2) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.8.1...v3.8.2) + + +- ⭐Increasing maximum pool of connections and adjusting cryptodome package dependency. + + + +## [v3.8.1](https://github.com/pubnub/python/tree/v3.8.1) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.8.0...v3.8.1) + + + +- 🐛Fixing bug with state setting and subscribe confirmation. + + +## [v3.8.0](https://github.com/pubnub/python/tree/v3.8.0) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.7.7...v3.8.0) + +- 🌟Mobile Gateway Functions. + + + +- 🌟Here Now for channel groups. + + + +- 🌟no-rep, store and fire(). + + + + +## [v3.7.7](https://github.com/pubnub/python/tree/v3.7.7) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.7.6...v3.7.7) + + +- ⭐Adding .stop() method for base python async operations to exit the listener. + + + +## [v3.7.6](https://github.com/pubnub/python/tree/v3.7.6) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.7.5...v3.7.6) + + + +- 🐛fixed issues in receiving gzipped response for twisted. + + + +- 🐛fix for non reporting of dns lookup failure. + + + +- 🐛fix in time method. + + +## [v3.7.5](https://github.com/pubnub/python/tree/v3.7.5) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.7.4...v3.7.5) + + +- ⭐increased timeout to 15 sec. + + + +## [v3.7.4](https://github.com/pubnub/python/tree/v3.7.4) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.7.2...v3.7.4) + + + +- 🐛added state and here_now. + +- 🌟added presence heartbeat support. + + + + +## [v3.7.2](https://github.com/pubnub/python/tree/v3.7.2) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.7.0...v3.7.2) + + + +- 🐛fix for decryption bug in history API. + + +- ⭐module name changed to pubnub ( it was Pubnub earlier ), developers need to do from pubnub import Pubnub, instead of from Pubnub import Pubnub now. + + + + +- 🐛fixed method arguments bug for presence API. + + +- ⭐subscribe_sync removed. + + + + +- 🐛fix for issue where error callback not invoked for presence. + +- 🌟added state support in subscribe and here now. + + + + + +- 🐛fix for grant API with python 3. + +- 🌟added include_token option to history. + + + + +## [v3.7.0](https://github.com/pubnub/python/tree/v3.7.0) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.5.3...v3.7.0) + +- 🌟Channel Groups functionality. + + + + +- ⭐Added Python Echo Server example. + + + + +- 🐛Added missing timeout keyword arg. + + +## [v3.5.3](https://github.com/pubnub/python/tree/v3.5.3) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.5.2...v3.5.3) + + + +- 🐛Added patch to handle quick net calls in Azure environments. + + + +- 🐛Presence fixes. + + + +- 🐛added daemon flag. + + +## [v3.5.2](https://github.com/pubnub/python/tree/v3.5.2) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.5.1...v3.5.2) + +- 🌟Added pnsdk URL param to each request. + + + + +- ⭐Added grant/revoke/audit examples to README. + + + + +- 🐛Fixed erroneous "Connected" error condition in console. + + +- ⭐Can now pass init vars via the CL on console. + + + + +- 🐛Fixed UI issue of bracket color on console. + + +- ⭐Enable subscribing to "-pnpres" channel on console. + + + +## [v3.5.1](https://github.com/pubnub/python/tree/v3.5.1) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.5.0...v3.5.1) + +- 🌟Added subscribe_sync method. + + + + +- ⭐renamed pres_uuid argument for Pubnub constructor to uuid. + + + +## [v3.5.0](https://github.com/pubnub/python/tree/v3.5.0) + + + +- 🌟Async subscribe allows for MX, unsubscribe calls. + + + + +- ⭐New method signatures -- be sure to check migration doc if upgrading. + + diff --git a/VERSION b/VERSION index a08ffae0..dcd32c18 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.8.2 +3.8.3 \ No newline at end of file diff --git a/pubnub.py b/pubnub.py index 92de455b..1f0182f6 100755 --- a/pubnub.py +++ b/pubnub.py @@ -6,7 +6,7 @@ # http://www.pubnub.com/ # ----------------------------------- -# PubNub 3.8.2 Real-time Push Cloud API +# PubNub 3.8.3 Real-time Push Cloud API # ----------------------------------- @@ -50,7 +50,6 @@ except ImportError: pass -#import urllib import socket import threading @@ -305,7 +304,7 @@ def __init__( """ self.origin = origin - self.version = '3.8.2' + self.version = '3.8.3' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key diff --git a/setup.py b/setup.py index 507c7ebf..dbb9d76a 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='3.8.2', + version='3.8.3', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 9ae61c089aade196e6f428823f1f3d6069f23feb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 14 Sep 2016 14:28:36 -0700 Subject: [PATCH 339/468] Add missing setup.py file --- setup.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 setup.py diff --git a/setup.py b/setup.py new file mode 100644 index 00000000..e6756531 --- /dev/null +++ b/setup.py @@ -0,0 +1,23 @@ +from setuptools import setup + +setup( + name='pubnub', + version='4.0.0.beta1', + description='PubNub Real-time push service in the cloud', + author='PubNub', + author_email='support@pubnub.com', + url='http://pubnub.com', + py_modules=['pubnub'], + license='MIT', + classifiers=( + 'Development Status :: 5 - Production/Stable', + 'Intended Audience :: Developers', + 'Programming Language :: Python', + 'License :: OSI Approved :: MIT License', + 'Operating System :: OS Independent', + 'Topic :: Internet :: WWW/HTTP', + 'Topic :: Software Development :: Libraries :: Python Modules', + ), + install_requires=[], + zip_safe=False, +) From 84d12ca795f23ecdef24ae3b24a8254e0a9c1f22 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 14 Sep 2016 14:38:39 -0700 Subject: [PATCH 340/468] update readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 64eada3b..0f9769dd 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ # PubNub Python SDK -[![Build Status](https://travis-ci.org/pubnub/python.svg?branch=master)](https://travis-ci.org/pubnub/python) [![PyPI](https://img.shields.io/pypi/v/pubnub.svg)](http://github.com/pubnub/python) #### [PubNub](http://www.pubnub.com) Real-time Data Network From 49a9cc8361efb90a613e6f3950cca8ce630d559f Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Thu, 15 Sep 2016 18:15:01 +0200 Subject: [PATCH 341/468] Twisted PubNub Client v4 --- .gitignore | 3 + .travis.yml | 0 examples/__init__.py | 0 examples/native_threads/publish.py | 0 pubnub/__init__.py | 0 pubnub/endpoints/__init__.py | 0 pubnub/endpoints/endpoint.py | 21 +- pubnub/endpoints/presence/__init__.py | 0 pubnub/endpoints/presence/here_now.py | 0 pubnub/errors.py | 0 pubnub/exceptions.py | 0 pubnub/models/__init__.py | 0 pubnub/models/consumer/__init__.py | 0 pubnub/models/consumer/presence.py | 0 pubnub/pnconfiguration.py | 0 pubnub/pubnub.py | 0 pubnub/pubnub_core.py | 4 +- pubnub/pubnub_tornado.py | 0 pubnub/pubnub_twisted.py | 401 ++++++++++++++----- pubnub/utils.py | 0 requirements-dev.txt | 0 scripts/install.sh | 0 scripts/run-tests.py | 0 tests/__init__.py | 0 tests/integrational/__init__.py | 0 tests/integrational/tornado/__init__.py | 0 tests/integrational/tornado/test_here_now.py | 0 tests/integrational/twisted/__init__.py | 0 tests/integrational/twisted/test_here_now.py | 0 29 files changed, 312 insertions(+), 117 deletions(-) mode change 100755 => 100644 .travis.yml mode change 100755 => 100644 examples/__init__.py mode change 100755 => 100644 examples/native_threads/publish.py mode change 100755 => 100644 pubnub/__init__.py mode change 100755 => 100644 pubnub/endpoints/__init__.py mode change 100755 => 100644 pubnub/endpoints/endpoint.py mode change 100755 => 100644 pubnub/endpoints/presence/__init__.py mode change 100755 => 100644 pubnub/endpoints/presence/here_now.py mode change 100755 => 100644 pubnub/errors.py mode change 100755 => 100644 pubnub/exceptions.py mode change 100755 => 100644 pubnub/models/__init__.py mode change 100755 => 100644 pubnub/models/consumer/__init__.py mode change 100755 => 100644 pubnub/models/consumer/presence.py mode change 100755 => 100644 pubnub/pnconfiguration.py mode change 100755 => 100644 pubnub/pubnub.py mode change 100755 => 100644 pubnub/pubnub_core.py mode change 100755 => 100644 pubnub/pubnub_tornado.py mode change 100755 => 100644 pubnub/pubnub_twisted.py mode change 100755 => 100644 pubnub/utils.py mode change 100755 => 100644 requirements-dev.txt mode change 100755 => 100644 scripts/install.sh mode change 100755 => 100644 scripts/run-tests.py mode change 100755 => 100644 tests/__init__.py mode change 100755 => 100644 tests/integrational/__init__.py mode change 100755 => 100644 tests/integrational/tornado/__init__.py mode change 100755 => 100644 tests/integrational/tornado/test_here_now.py mode change 100755 => 100644 tests/integrational/twisted/__init__.py mode change 100755 => 100644 tests/integrational/twisted/test_here_now.py diff --git a/.gitignore b/.gitignore index 06b38ad0..16841382 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,6 @@ target/ # Twisted _trial_temp + +# jupyter dev notebook +PubNubTwisted.ipynb diff --git a/.travis.yml b/.travis.yml old mode 100755 new mode 100644 diff --git a/examples/__init__.py b/examples/__init__.py old mode 100755 new mode 100644 diff --git a/examples/native_threads/publish.py b/examples/native_threads/publish.py old mode 100755 new mode 100644 diff --git a/pubnub/__init__.py b/pubnub/__init__.py old mode 100755 new mode 100644 diff --git a/pubnub/endpoints/__init__.py b/pubnub/endpoints/__init__.py old mode 100755 new mode 100644 diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py old mode 100755 new mode 100644 index 8c4309ee..1e93904e --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -90,17 +90,18 @@ def sync(self): return envelope def async(self, callback): - try: + def handler(): self.validate_params() - options = self.options() - except PubNubException as e: - callback(None, self.create_status_response(PNStatusCategory.PNBadRequestCategory, None, None, e)) - return + return self.options() def callback_wrapper(envelope): callback(envelope.result, envelope.status) - return self.pubnub.request_async(self.name(), options, callback_wrapper, self._cancellation_event) + return self.pubnub.request_async(options_func=handler, + create_response=self.create_response, + create_status_response=self.create_status_response, + cancellation_event=self._cancellation_event, + callback=callback_wrapper) def future(self): def handler(): @@ -118,10 +119,10 @@ def handler(): self.validate_params() return self.options() - # TODO: move .addCallback(self.create_response) logic to request_deferred() - return self.pubnub \ - .request_deferred(handler) \ - .addCallback(self.create_response) + return self.pubnub.request_deferred(options_func=handler, + create_response=self.create_response, + create_status_response=self.create_status_response, + cancellation_event=self._cancellation_event) def default_params(self): return { diff --git a/pubnub/endpoints/presence/__init__.py b/pubnub/endpoints/presence/__init__.py old mode 100755 new mode 100644 diff --git a/pubnub/endpoints/presence/here_now.py b/pubnub/endpoints/presence/here_now.py old mode 100755 new mode 100644 diff --git a/pubnub/errors.py b/pubnub/errors.py old mode 100755 new mode 100644 diff --git a/pubnub/exceptions.py b/pubnub/exceptions.py old mode 100755 new mode 100644 diff --git a/pubnub/models/__init__.py b/pubnub/models/__init__.py old mode 100755 new mode 100644 diff --git a/pubnub/models/consumer/__init__.py b/pubnub/models/consumer/__init__.py old mode 100755 new mode 100644 diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py old mode 100755 new mode 100644 diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py old mode 100755 new mode 100644 diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py old mode 100755 new mode 100644 diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py old mode 100755 new mode 100644 index b4e3dc56..ff316587 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -50,12 +50,12 @@ def __init__(self, config): self._publish_sequence_manager = None @abstractmethod - def request_deferred(self, options_func): + def request_deferred(self, options, create_response, create_status_response, cancellation_event): pass @property def sdk_name(self): - return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) + return "%s-%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) @abstractmethod def sdk_platform(self): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py old mode 100755 new mode 100644 diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py old mode 100755 new mode 100644 index 17899c3b..c2a106db --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -1,34 +1,38 @@ import json import logging +import time +from urlparse import urlparse, parse_qs from StringIO import StringIO from twisted.internet import reactor as _reactor -from twisted.internet.defer import Deferred -from twisted.internet import defer +from twisted.internet.task import LoopingCall +from twisted.internet.defer import Deferred, DeferredQueue from twisted.internet.protocol import Protocol +from twisted.internet.error import ConnectingCancelledError, DNSLookupError from twisted.web.client import Agent, ContentDecoderAgent -from twisted.web.client import RedirectAgent, GzipDecoder from twisted.web.client import HTTPConnectionPool from twisted.web.http_headers import Headers -from twisted.internet.ssl import ClientContextFactory from twisted.web.client import FileBodyProducer from . import utils -from .errors import PNERR_JSON_DECODING_FAILED, PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR -from .exceptions import PubNubException +from .workers import SubscribeMessageWorker from .pubnub_core import PubNubCore +from .managers import SubscriptionManager, PublishSequenceManager +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions +from .errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_CONNECTION_ERROR, PNERR_HTTP_ERROR, \ + PNERR_SERVER_ERROR, PNERR_JSON_DECODING_FAILED +from .exceptions import PubNubException +from .structures import RequestOptions, PlatformOptions, ResponseInfo -logger = logging.getLogger("pubnub") - +from .endpoints.pubsub.subscribe import Subscribe +from .endpoints.presence.leave import Leave +from .endpoints.presence.heartbeat import Heartbeat -class WebClientContextFactory(ClientContextFactory): - def getContext(self, hostname, port): - return ClientContextFactory.getContext(self) +logger = logging.getLogger("pubnub") -# class PubNubResponse(Protocol, TimeoutMixin): class PubNubResponse(Protocol): def __init__(self, finished, code): self.finished = finished @@ -38,15 +42,151 @@ def dataReceived(self, body): self.finished.callback(TwistedResponse(body, self.code)) +class TwistedSubscribeMessageWorker(SubscribeMessageWorker): + def run(self): + self._take_message() + + def _take_message(self): + self._queue.get().addCallback(self.send_message_to_processing) + + def send_message_to_processing(self, message): + if message is not None: + self._pubnub.reactor.callInThread(self._process_incoming_payload, message) + + +class TwistedSubscriptionManager(SubscriptionManager): + def __init__(self, pubnub_instance): + self._message_queue = DeferredQueue() + self.worker_loop = None + self._heartbeat_loop = None + self._heartbeat_call = None + super(TwistedSubscriptionManager, self).__init__(pubnub_instance) + + def _announce_status(self, status): + self._listener_manager.announce_status(status) + + def _start_worker(self): + consumer = TwistedSubscribeMessageWorker(self._pubnub, self._listener_manager, self._message_queue, None) + self.worker_loop = LoopingCall(consumer.run).start(0.1, False) + + def _set_consumer_event(self): + raise NotImplementedError + + def _message_queue_put(self, message): + self._message_queue.put(message) + + def _start_subscribe_loop(self): + self._stop_subscribe_loop() + + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) + + if len(combined_channels) == 0 and len(combined_groups) == 0: + return + + def continue_subscribe_loop(envelope): + try: + self._handle_endpoint_call(envelope.raw_result, envelope.status) + except Exception as ex: + return ex + self._start_subscribe_loop() + + def manage_failure(failure): + if failure.type == PubNubTwistedException: + self._announce_status(failure.value.status) + if failure.value.status.category in (PNStatusCategory.PNDisconnectedCategory, + PNStatusCategory.PNUnexpectedDisconnectCategory, + PNStatusCategory.PNCancelledCategory, + PNStatusCategory.PNBadRequestCategory, + PNStatusCategory.PNMalformedFilterExpressionCategory): + time.sleep(30) # TODO: SET VALUE ACCORDING TO DOCS + self._start_subscribe_loop() + else: + print(failure) + return failure + + try: + self._subscribe_request_task = Subscribe(self._pubnub) \ + .channels(combined_channels) \ + .channel_groups(combined_groups) \ + .timetoken(self._timetoken) \ + .region(self._region) \ + .filter_expression(self._pubnub.config.filter_expression) \ + .deferred() \ + .addCallbacks(continue_subscribe_loop, manage_failure) + + except Exception as ex: + raise ex + + def _stop_subscribe_loop(self): + if self._subscribe_request_task is not None and not self._subscribe_request_task.called: + self._subscribe_request_task.cancel() + + def _stop_heartbeat_timer(self): + if self._heartbeat_call is not None: + self._heartbeat_call.cancel() + + if self._heartbeat_loop is not None: + self._heartbeat_loop.cancel() + + def _register_heartbeat_timer(self): + super(TwistedSubscriptionManager, self)._register_heartbeat_timer() + self._heartbeat_loop = LoopingCall(self._perform_heartbeat_loop) + interval = self._pubnub.config.heartbeat_interval / 2 - 1 + self._heartbeat_loop.start(interval, True) + + def _perform_heartbeat_loop(self): + def heartbeat_callback(_, status): + heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options + if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or ( + status.is_error() is True and heartbeat_verbosity == PNHeartbeatNotificationOptions.FAILURES): + self._listener_manager.announce_status(status) + + if self._heartbeat_call is not None: + self._heartbeat_call.cancel() + + state_payload = self._subscription_state.state_payload() + channels = self._subscription_state.prepare_channel_list(False) + channel_groups = self._subscription_state.prepare_channel_group_list(False) + + self._heartbeat_call = Heartbeat(self._pubnub) \ + .channels(channels) \ + .channel_groups(channel_groups) \ + .state(state_payload) \ + .async(heartbeat_callback) + + def _send_leave(self, unsubscribe_operation): + def announce_leave_status(response, status): + self._listener_manager.announce_status(status) + + Leave(self._pubnub) \ + .channels(unsubscribe_operation.channels) \ + .channel_groups(unsubscribe_operation.channel_groups) \ + .async(announce_leave_status) + + def reconnect(self): + if self.worker_loop is not None: + self._start_subscribe_loop() + self._register_heartbeat_timer() + else: + # TODO: actual error + pass + + class PubNubTwisted(PubNubCore): """PubNub Python API for Twisted framework""" def sdk_platform(self): - return "-Twisted" + return "Twisted" def __init__(self, config, pool=None, reactor=None): super(PubNubTwisted, self).__init__(config) + self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) + self._subscription_manager = TwistedSubscriptionManager(self) + + self.disconnected_times = 0 + if reactor is None: self.reactor = _reactor else: @@ -54,9 +194,9 @@ def __init__(self, config, pool=None, reactor=None): if pool is None: self.pnconn_pool = HTTPConnectionPool(self.reactor, persistent=True) - self.pnconn_pool.maxPersistentPerHost = 100000 - self.pnconn_pool.cachedConnectionTimeout = 15 - self.pnconn_pool.retryAutomatically = True + self.pnconn_pool.maxPersistentPerHost = 3 + self.pnconn_pool.cachedConnectionTimeout = self.config.subscribe_request_timeout + self.pnconn_pool.retryAutomatically = False else: self.pnconn_pool = pool @@ -70,57 +210,48 @@ def start(self): def stop(self): self.reactor.stop() - def timeout(self, delay, callback, *args): - def cb(): - if callback is not None: - callback(*args) - - timeout = self.reactor.callLater(delay, cb) - - def cancel(): - if timeout.active(): - timeout.cancel() - - return cancel - - def async_error_to_return(self, e, errback): - errback(e) + def add_listener(self, listener): + if self._subscription_manager is not None: + self._subscription_manager.add_listener(listener) + else: + raise Exception("Subscription manager is not enabled for this instance") - def request_async(self, options, success, error): + def request_async(self, options_func, create_response, create_status_response, callback, cancellation_event): """ - Request in non-common for Twisted way - using callbacks - WARNING: currently is buggy - - :param error: - :param success: - :param options: - :return: async handler + :param options_func: + :param create_response: + :param create_status_response: + :param callback: + :param cancellation_event: """ - def handler(): - def _invoke(func, data): - if func is not None: - func(data) - def s(data): - _invoke(success, data) + def async_request(options_func, create_response, create_status_response, cancellation_event, callback): + def manage_failures(failure): + # Cancelled + if failure.type == ConnectingCancelledError: + return + elif failure.type == PubNubTwistedException: + callback(failure.value) + else: + return failure - def e(err): - _invoke(error, err) + request = self.request_deferred(options_func, create_response, create_status_response, cancellation_event) + request.addCallbacks(callback, manage_failures) - self.request_deferred(options).addCallbacks(s, e) + self.reactor.callInThread(async_request, + options_func, + create_response, + create_status_response, + cancellation_event, + callback) - return handler() + return - def request_deferred(self, options_func): - # TODO: handle timeout and encoder_map - # TODO: unify error objects - rc = self.reactor + def request_deferred(self, options_func, create_response, create_status_response, cancellation_event): + options = options_func() + reactor = self.reactor pnconn_pool = self.pnconn_pool headers = self.headers - try: - options = options_func() - except PubNubException as e: - return defer.fail(e) url = utils.build_url(self.config.scheme(), self.config.origin, options.path, options.query_string) @@ -128,85 +259,145 @@ def request_deferred(self, options_func): logger.debug("%s %s %s" % (options.method_string, url, options.data)) def handler(): - # url = self.getUrl(request, encoder_map) - - agent = ContentDecoderAgent(RedirectAgent(Agent( - rc, - contextFactory=WebClientContextFactory(), - pool=pnconn_pool - )), [('gzip', GzipDecoder)]) + agent = Agent(reactor, pool=pnconn_pool) if options.data is not None: - print(options.data) body = FileBodyProducer(StringIO(options.data)) else: body = None - try: - request = agent.request( - options.method_string, - url, - Headers(headers), - body) - except TypeError: - request = agent.request( - options.method_string, - url.encode(), - Headers(headers), - body) + request = agent.request( + options.method_string, + url, + Headers(headers), + FileBodyProducer(StringIO(body))) def received(response): finished = Deferred() - response.deliverBody(PubNubResponse(finished, response.code)) return finished - def success(response): + def success(response, req_url, request): + parsed_url = urlparse(req_url) + query = parse_qs(parsed_url.query) + uuid = None + auth_key = None + + if 'uuid' in query and len(query['uuid']) > 0: + uuid = query['uuid'][0] + + if 'auth_key' in query and len(query['auth_key']) > 0: + auth_key = query['auth_key'][0] + response_body = response.body code = response.code d = Deferred() - try: - data = json.loads(response_body) - except ValueError: - try: - data = json.loads(response_body.decode("utf-8")) - except ValueError: - d.errback(PubNubException( - pn_error=PNERR_JSON_DECODING_FAILED, - errormsg='json decode error' - )) - return + response_info = ResponseInfo( + status_code=response.code, + tls_enabled='https' == parsed_url.scheme, + origin=parsed_url.netloc, + uuid=uuid, + auth_key=auth_key, + client_request=request + ) if code != 200: - if code >= 500: - err = PNERR_SERVER_ERROR + if code == 403: + status_category = PNStatusCategory.PNAccessDeniedCategory + elif code == 400: + status_category = PNStatusCategory.PNBadRequestCategory else: - err = PNERR_CLIENT_ERROR - - if data is None: - data = "N/A" + status_category = self - d.errback(PubNubException( - pn_error=err, - errormsg=data, - status_code=code - )) + if code >= 500: + error = PNERR_SERVER_ERROR + else: + error = PNERR_CLIENT_ERROR else: - d.callback(data) + error = None + status_category = PNStatusCategory.PNAcknowledgmentCategory + try: + data = json.loads(response_body) + except ValueError: + try: + data = json.loads(response_body.decode("utf-8")) + except ValueError: + raise PubNubTwistedException( + result=create_response(None), + status=create_status_response( + status_category, + response_info, + PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error' + ) + ) + ) + + if error: + raise PubNubTwistedException( + result=data, + status=create_status_response(status_category, data, response_info, + PubNubException( + errormsg=data, + pn_error=error, + status_code=response.code + ))) + + envelope = TwistedEnvelope( + create_response(data), + create_status_response( + status_category, + response, + response_info, + error), + data + ) + d.callback(envelope) return d + def failed(failure): + raise PubNubTwistedException( + result=None, + status=create_status_response(PNStatusCategory.PNTLSConnectionFailedCategory, + None, + None, + PubNubException( + errormsg='Connection error', + pn_error=PNERR_CONNECTION_ERROR, + status_code=0 + ))) + + request.addErrback(failed) request.addCallback(received) - # request.addErrback(error) - request.addCallback(success) - # request.addErrback(error) + request.addCallback(success, url, request) return request return handler() + def disconnected(self): + return self.disconnected_times > 0 + + +class TwistedEnvelope(object): + def __init__(self, result, status, raw_result=None): + self.result = result + self.status = status + self.raw_result = raw_result + class TwistedResponse(object): def __init__(self, body, code): self.body = body self.code = code + + +class PubNubTwistedException(Exception): + def __init__(self, result, status): + self.result = result + self.status = status + + def __str__(self): + return str(self.status.error_data.exception) diff --git a/pubnub/utils.py b/pubnub/utils.py old mode 100755 new mode 100644 diff --git a/requirements-dev.txt b/requirements-dev.txt old mode 100755 new mode 100644 diff --git a/scripts/install.sh b/scripts/install.sh old mode 100755 new mode 100644 diff --git a/scripts/run-tests.py b/scripts/run-tests.py old mode 100755 new mode 100644 diff --git a/tests/__init__.py b/tests/__init__.py old mode 100755 new mode 100644 diff --git a/tests/integrational/__init__.py b/tests/integrational/__init__.py old mode 100755 new mode 100644 diff --git a/tests/integrational/tornado/__init__.py b/tests/integrational/tornado/__init__.py old mode 100755 new mode 100644 diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py old mode 100755 new mode 100644 diff --git a/tests/integrational/twisted/__init__.py b/tests/integrational/twisted/__init__.py old mode 100755 new mode 100644 diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py old mode 100755 new mode 100644 From 7d6c6b88ad5005ed714884b512af36633cd6006e Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Fri, 16 Sep 2016 11:34:43 +0200 Subject: [PATCH 342/468] Make tests run --- pubnub/endpoints/endpoint.py | 2 +- pubnub/pubnub.py | 2 +- pubnub/pubnub_twisted.py | 10 +++++----- scripts/install.sh | 0 scripts/run-tests.py | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) mode change 100644 => 100755 scripts/install.sh mode change 100644 => 100755 scripts/run-tests.py diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 1e93904e..bce6e988 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,7 +1,7 @@ from abc import ABCMeta, abstractmethod from pubnub import utils -from pubnub.enums import PNStatusCategory +# from pubnub.enums import PNStatusCategory from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING, \ PNERR_SECRET_KEY_MISSING, PNERR_CHANNEL_MISSING from pubnub.exceptions import PubNubException diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 9ea5a6ba..df4d0007 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -290,7 +290,7 @@ def wait_for_disconnect(self): if not self.disconnected_event.is_set(): self.disconnected_event.wait() else: - raise Exception("the instance is already connected") + raise Exception("the instance is already disconnected") def wait_for_message_on(self, *channel_names): channel_names = list(channel_names) diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index c2a106db..1f53dce6 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -9,8 +9,8 @@ from twisted.internet.task import LoopingCall from twisted.internet.defer import Deferred, DeferredQueue from twisted.internet.protocol import Protocol -from twisted.internet.error import ConnectingCancelledError, DNSLookupError -from twisted.web.client import Agent, ContentDecoderAgent +from twisted.internet.error import ConnectingCancelledError +from twisted.web.client import Agent from twisted.web.client import HTTPConnectionPool from twisted.web.http_headers import Headers from twisted.web.client import FileBodyProducer @@ -21,10 +21,10 @@ from .managers import SubscriptionManager, PublishSequenceManager from .enums import PNStatusCategory, PNHeartbeatNotificationOptions -from .errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_CONNECTION_ERROR, PNERR_HTTP_ERROR, \ +from .errors import PNERR_CLIENT_ERROR, PNERR_CONNECTION_ERROR, \ PNERR_SERVER_ERROR, PNERR_JSON_DECODING_FAILED from .exceptions import PubNubException -from .structures import RequestOptions, PlatformOptions, ResponseInfo +from .structures import ResponseInfo from .endpoints.pubsub.subscribe import Subscribe from .endpoints.presence.leave import Leave @@ -139,7 +139,7 @@ def _perform_heartbeat_loop(self): def heartbeat_callback(_, status): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or ( - status.is_error() is True and heartbeat_verbosity == PNHeartbeatNotificationOptions.FAILURES): + status.is_error() is True and heartbeat_verbosity == PNHeartbeatNotificationOptions.FAILURES): self._listener_manager.announce_status(status) if self._heartbeat_call is not None: diff --git a/scripts/install.sh b/scripts/install.sh old mode 100644 new mode 100755 diff --git a/scripts/run-tests.py b/scripts/run-tests.py old mode 100644 new mode 100755 index 87fe3cf5..dbea776c --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -28,9 +28,9 @@ def run(command): if version.startswith('2.6'): run( '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 -elif version.startswith('2.7'): +elif version.startswith('2.7') or version.startswith('anaconda2'): # TODO: remove twisted ignore option when the tests will be ready - run("%s,*asyncio*,*python_v35*" % fcmn) + run("%s,*asyncio*,*python_v35*,examples/" % fcmn) run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.3'): run("%s,*asyncio*,*python_v35*" % fcmn) From 568e5300e1f44210788fdfa8288d43e72ef2258a Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Fri, 16 Sep 2016 12:30:01 +0200 Subject: [PATCH 343/468] Fixed SDK platform --- pubnub/pubnub_core.py | 2 +- pubnub/pubnub_twisted.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index ff316587..dba01795 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -55,7 +55,7 @@ def request_deferred(self, options, create_response, create_status_response, can @property def sdk_name(self): - return "%s-%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) + return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) @abstractmethod def sdk_platform(self): diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 1f53dce6..7e3f1f9c 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -177,7 +177,7 @@ class PubNubTwisted(PubNubCore): """PubNub Python API for Twisted framework""" def sdk_platform(self): - return "Twisted" + return "-Twisted" def __init__(self, config, pool=None, reactor=None): super(PubNubTwisted, self).__init__(config) From 3134216c64d33552f38cd8cb9e4c785cfdf2a72b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 18 Sep 2016 14:51:05 -0700 Subject: [PATCH 344/468] Add unsubscribe_all() method --- pubnub/managers.py | 6 ++ pubnub/pubnub_core.py | 3 + tests/integrational/asyncio/test_subscribe.py | 63 +++++++++++-- .../asyncio/subscription/unsubscribe_all.yaml | 90 +++++++++++++++++++ 4 files changed, 155 insertions(+), 7 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml diff --git a/pubnub/managers.py b/pubnub/managers.py index 32a504fc..0f2f7d6a 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -201,6 +201,12 @@ def get_subscribed_channels(self): def get_subscribed_channel_groups(self): return self._subscription_state.prepare_channel_group_list(False) + def unsubscribe_all(self): + self.adapt_unsubscribe_builder(UnsubscribeOperation( + channels=self._subscription_state.prepare_channel_list(False), + channel_groups=self._subscription_state.prepare_channel_group_list(False) + )) + def adapt_subscribe_builder(self, subscribe_operation): assert isinstance(subscribe_operation, SubscribeOperation) self._subscription_state.adapt_subscribe_builder(subscribe_operation) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index dba01795..08b06bf5 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -103,6 +103,9 @@ def subscribe(self): def unsubscribe(self): return UnsubscribeBuilder(self._subscription_manager) + def unsubscribe_all(self): + return self._subscription_manager.unsubscribe_all() + def heartbeat(self): return Heartbeat(self) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index ce0b1697..9916b530 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -270,10 +270,8 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() yield from callback_presence.wait_for_connect() - print("connected #1") prs_envelope = yield from callback_presence.wait_for_presence_on(ch) - print("presence #2") assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub_listener.uuid assert prs_envelope.actual_channel == ch + "-pnpres" @@ -281,12 +279,10 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() - print("subscribed to cg #3") callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_connect()) presence_messages_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) yield from asyncio.wait([callback_messages_future, presence_messages_future]) - print("connect/presence #4") prs_envelope = presence_messages_future.result() assert prs_envelope.event == 'join' @@ -299,7 +295,6 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): callback_messages_future = asyncio.ensure_future(callback_messages.wait_for_disconnect()) presence_messages_future = asyncio.ensure_future(callback_presence.wait_for_presence_on(ch)) yield from asyncio.wait([callback_messages_future, presence_messages_future]) - print("disconnect/presence #5") prs_envelope = presence_messages_future.result() assert prs_envelope.event == 'leave' @@ -309,11 +304,65 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): pubnub_listener.unsubscribe().channel_groups(gr).execute() yield from callback_presence.wait_for_disconnect() - print("presence disconnect #6") envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() assert envelope.status.original_response['status'] == 200 - print("channel removed #7") pubnub.stop() pubnub_listener.stop() + + +@get_sleeper('tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml', + match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'string_list_in_query'], + match_on_kwargs={ + 'string_list_in_path': { + 'positions': [4, 6] + }, + 'string_list_in_query': { + 'list_keys': ['channel-group'] + } + } + ) +@pytest.mark.asyncio +def test_unsubscribe_all(event_loop, sleeper=asyncio.sleep): + pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + pubnub.config.uuid = "test-subscribe-asyncio-messenger" + + ch = "test-subscribe-asyncio-unsubscribe-all-ch" + ch1 = "test-subscribe-asyncio-unsubscribe-all-ch1" + ch2 = "test-subscribe-asyncio-unsubscribe-all-ch2" + ch3 = "test-subscribe-asyncio-unsubscribe-all-ch3" + gr1 = "test-subscribe-asyncio-unsubscribe-all-gr1" + gr2 = "test-subscribe-asyncio-unsubscribe-all-gr2" + + envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr1).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + envelope = yield from pubnub.add_channel_to_channel_group().channel_group(gr2).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + yield from sleeper(1) + + callback_messages = SubscribeListener() + pubnub.add_listener(callback_messages) + + pubnub.subscribe().channels([ch1, ch2, ch3]).channel_groups([gr1, gr2]).execute() + yield from callback_messages.wait_for_connect() + + assert len(pubnub.get_subscribed_channels()) == 3 + assert len(pubnub.get_subscribed_channel_groups()) == 2 + + pubnub.unsubscribe_all() + + yield from callback_messages.wait_for_disconnect() + + assert len(pubnub.get_subscribed_channels()) == 0 + assert len(pubnub.get_subscribed_channel_groups()) == 0 + + envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr1).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + envelope = yield from pubnub.remove_channel_from_channel_group().channel_group(gr2).channels(ch).future() + assert envelope.status.original_response['status'] == 200 + + pubnub.stop() diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml new file mode 100644 index 00000000..96217de8 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -0,0 +1,90 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-subscribe-asyncio-messenger + response: + body: {string: '{"t":{"t":"14742262356649203","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:15 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-subscribe-asyncio-messenger +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 + GMT', SERVER: Pubnub} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger +version: 1 From e4ebe0123ae3357c55c7fcbc72f9d84aa0a03bc9 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 22 Sep 2016 13:48:19 -0700 Subject: [PATCH 345/468] do not test against nightly --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 94dc2c78..d6bceb97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,11 @@ python: - "3.3" - "3.4.4" - "3.5" - - "nightly" - "pypy" sudo: false install: - bash scripts/install.sh -script: +script: - python scripts/run-tests.py after_success: - codecov From 3b5800c5215ef2c1a36b6452ec8702c2a8e318cb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Sep 2016 03:30:55 -0700 Subject: [PATCH 346/468] Remove Twisted tests; Add twisted publish example --- examples/twisted/publish.py | 58 ++++++++ tests/integrational/twisted/__init__.py | 0 tests/integrational/twisted/test_here_now.py | 82 ---------- tests/integrational/twisted/test_publish.py | 149 ------------------- 4 files changed, 58 insertions(+), 231 deletions(-) create mode 100644 examples/twisted/publish.py delete mode 100644 tests/integrational/twisted/__init__.py delete mode 100644 tests/integrational/twisted/test_here_now.py delete mode 100644 tests/integrational/twisted/test_publish.py diff --git a/examples/twisted/publish.py b/examples/twisted/publish.py new file mode 100644 index 00000000..ba7fc48e --- /dev/null +++ b/examples/twisted/publish.py @@ -0,0 +1,58 @@ +# PubNub HereNow usage example +import sys + +sys.path.append("../../") + +from examples import pnconf +from pubnub.pubnub_twisted import PubNubTwisted + + +pubnub = PubNubTwisted(pnconf) + + +def successHandler(env): + print("success >>>") + print(env.result.timetoken) + pubnub.stop() + + +def errorHandler(err): + print("error >>>") + print(err) + pubnub.stop() + + +def async_callback(result, status): + if status.is_error(): + print("async error >>>") + print(status.error_data.information) + else: + print("async result >>>") + print(result.timetoken) + + +# using deferred: +deferred = pubnub.publish() \ + .channel("my_channel") \ + .message("hey")\ + .deferred() + +deferred.addCallback(successHandler) +deferred.addErrback(errorHandler) + +# using deferred: +deferred = pubnub.publish() \ + .channel("my_channel") \ + .message("hey")\ + .deferred() + +deferred.addCallback(successHandler) +deferred.addErrback(errorHandler) + +# using async: +pubnub.publish() \ + .channel("my_channel") \ + .message("hey")\ + .async(async_callback) + +pubnub.start() diff --git a/tests/integrational/twisted/__init__.py b/tests/integrational/twisted/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py deleted file mode 100644 index bd705679..00000000 --- a/tests/integrational/twisted/test_here_now.py +++ /dev/null @@ -1,82 +0,0 @@ -from twisted.internet import defer -from twisted.internet.task import deferLater -from twisted.internet.tcp import Client -from twisted.internet import reactor -from twisted.trial import unittest -from twisted.web.client import HTTPConnectionPool - -import logging -import pubnub -from pubnub.pubnub_twisted import PubNubTwisted -from tests.helper import pnconf - -pubnub.set_stream_logger('pubnub', logging.DEBUG) - - -class TestPubNubAsyncAsyncHereNow(unittest.TestCase): - def setUp(self): - self.pool = HTTPConnectionPool(reactor, False) - - def tearDown(self): - def _check_fds(_): - fds = set(reactor.getReaders() + reactor.getReaders()) - if not [fd for fd in fds if isinstance(fd, Client)]: - return - return deferLater(reactor, 0, _check_fds, None) - - return self.pool.closeCachedConnections().addBoth(_check_fds) - - def success(self, res): - pass - # self.assertEqual(res.total_occupancy, 1) - - def error(self, error): - return defer.fail(error) - - def test_success_deferred(self): - d = defer.Deferred() - - pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - - pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .deferred() \ - .addCallback(self.success) \ - .addCallbacks(d.callback, d.errback) - - return d - - def test_success_sync(self): - pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - - res = pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .sync() - - print('sync', res) - - def xtest_success_async(self): - d = defer.Deferred() - - pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - - success = self.success - error = self.error - - def success_wrapper(res): - success(res) - # REVIEW: Hanging on assertion - d.callback(None) - - def error_wrapper(err): - error(err) - d.errback(None) - - pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .async(success_wrapper, error_wrapper) - - return d diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py deleted file mode 100644 index aa86e0f6..00000000 --- a/tests/integrational/twisted/test_publish.py +++ /dev/null @@ -1,149 +0,0 @@ -from twisted.internet import defer -from twisted.internet.task import deferLater -from twisted.internet.tcp import Client -from twisted.internet import reactor -from twisted.trial import unittest -from twisted.web.client import HTTPConnectionPool - -import logging -import pubnub -from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub_twisted import PubNubTwisted -from tests.helper import pnconf - -pubnub.set_stream_logger('pubnub', logging.DEBUG) -defer.setDebugging(True) - -ch = "twisted-int-publish" - - -class TwistedTest(unittest.TestCase): - def setUp(self): - self.pool = HTTPConnectionPool(reactor, False) - self.pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - - def tearDown(self): - def _check_fds(_): - fds = set(reactor.getReaders() + reactor.getReaders()) - if not [fd for fd in fds if isinstance(fd, Client)]: - return - return deferLater(reactor, 0, _check_fds, None) - - return self.pool.closeCachedConnections().addBoth(_check_fds) - - -class TestPubNubPublishSuccess(TwistedTest): - def callback(self, res, third=None): - print(res.timetoken) - assert res.timetoken > 0 - - def errback(self, error): - return defer.fail(error) - - def assert_success(self, pub): - d = defer.Deferred() - pub.deferred().addCallback(self.callback, self.errback).addCallbacks(d.callback, d.errback) - return d - - def assert_success_publish_get(self, msg): - return self.assert_success( - PubNubTwisted(pnconf, reactor=reactor, pool=self.pool).publish().channel(ch).message(msg)) - - def assert_success_publish_post(self, msg): - return self.assert_success( - PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - .publish().channel(ch).message(msg).use_post(True)) - - def test_success_publish_string_get(self): - return self.assert_success_publish_get("hey") - - def test_success_publish_int_get(self): - return self.assert_success_publish_get(5) - - def test_success_publish_bool_get(self): - return self.assert_success_publish_get(True) - - def test_success_publish_list_get(self): - return self.assert_success_publish_get(["hi", "hi2", "hi3"]) - - def test_success_publish_dict_get(self): - return self.assert_success_publish_get({"name": "Alex", "online": True}) - - def test_success_publish_string_post(self): - return self.assert_success_publish_get("hey") - - def test_success_publish_int_post(self): - return self.assert_success_publish_get(5) - - def test_success_publish_bool_post(self): - return self.assert_success_publish_get(True) - - def test_success_publish_list_post(self): - return self.assert_success_publish_get(["hi", "hi2", "hi3"]) - - def test_success_publish_dict_post(self): - return self.assert_success_publish_get({"name": "Alex", "online": True}) - - def test_success_publish_do_not_store(self): - return self.assert_success( - PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - .publish().channel(ch).message("hey").should_store(False)) - - def test_success_publish_with_meta(self): - return self.assert_success( - PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) - .publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'})) - - -class TestPubNubPublishError(TwistedTest): - def callback(self, res, third=None): - return defer.fail("Success while while is expected: " + str(res)) - - def errback_message_missing(self, error): - self.assertIn("Message missing", error.getErrorMessage()) - return defer.succeed(None) - - def errback_channel_missing(self, error): - self.assertIn("Channel missing", error.getErrorMessage()) - return defer.succeed(None) - - def errback_non_serializable(self, error): - self.assertIn("not JSON serializable", error.getErrorMessage()) - return defer.succeed(None) - - def errback_invalid_key(self, error): - self.assertIn("HTTP Client Error (400)", error.getErrorMessage()) - self.assertIn("Invalid Key", error.getErrorMessage()) - return defer.succeed(None) - - def assert_error(self, pub, errback): - d = defer.Deferred() - pub.deferred() \ - .addCallbacks(self.callback, errback) \ - .addCallbacks(d.callback, d.errback) - - return d - - def test_error_missing_message(self): - return self.assert_error(self.pubnub.publish().channel(ch).message(None), - self.errback_message_missing) - - def test_error_missing_channel(self): - return self.assert_error(self.pubnub.publish().channel("").message("hey"), - self.errback_channel_missing) - - def test_error_non_serializable(self): - def method(): - pass - - return self.assert_error(self.pubnub.publish().channel(ch).message(method), - self.errback_non_serializable) - - def test_error_invalid_key(self): - conf = PNConfiguration() - conf.publish_key = "fake" - conf.subscribe_key = "demo" - self.pubnub = PubNubTwisted(conf, reactor=reactor, pool=self.pool) - - return self.assert_error(self.pubnub.publish().channel(ch).message("hey"), - self.errback_invalid_key) From 8a29196dec54e767d9d12b2675a83ba7c32be3e9 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Sep 2016 03:32:05 -0700 Subject: [PATCH 347/468] Fix Twisted async invokation --- pubnub/endpoints/endpoint.py | 22 ++++++++++++---------- pubnub/pubnub_core.py | 7 +++---- pubnub/pubnub_twisted.py | 32 +++++++++++++------------------- 3 files changed, 28 insertions(+), 33 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index bce6e988..df35b4d1 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,7 +1,7 @@ from abc import ABCMeta, abstractmethod from pubnub import utils -# from pubnub.enums import PNStatusCategory +from pubnub.enums import PNStatusCategory from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING, \ PNERR_SECRET_KEY_MISSING, PNERR_CHANNEL_MISSING from pubnub.exceptions import PubNubException @@ -90,18 +90,21 @@ def sync(self): return envelope def async(self, callback): - def handler(): + try: self.validate_params() - return self.options() + options = self.options() + except PubNubException as e: + callback(None, self.create_status_response(PNStatusCategory.PNBadRequestCategory, None, None, e)) + return def callback_wrapper(envelope): callback(envelope.result, envelope.status) - return self.pubnub.request_async(options_func=handler, - create_response=self.create_response, - create_status_response=self.create_status_response, - cancellation_event=self._cancellation_event, - callback=callback_wrapper) + return self.pubnub.request_async(endpoint_name=self.name(), + endpoint_call_options=options, + callback=callback_wrapper, + # REVIEW: include self._cancellation_event into options? + cancellation_event=self._cancellation_event) def future(self): def handler(): @@ -109,6 +112,7 @@ def handler(): return self.options() return self.pubnub.request_future(options_func=handler, + # REVIEW: self.create_* persists inside self.options, remove? create_response=self.create_response, create_status_response=self.create_status_response, cancellation_event=self._cancellation_event @@ -120,8 +124,6 @@ def handler(): return self.options() return self.pubnub.request_deferred(options_func=handler, - create_response=self.create_response, - create_status_response=self.create_status_response, cancellation_event=self._cancellation_event) def default_params(self): diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 08b06bf5..c2576d36 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -49,10 +49,6 @@ def __init__(self, config): self._subscription_manager = None self._publish_sequence_manager = None - @abstractmethod - def request_deferred(self, options, create_response, create_status_response, cancellation_event): - pass - @property def sdk_name(self): return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) @@ -106,6 +102,9 @@ def unsubscribe(self): def unsubscribe_all(self): return self._subscription_manager.unsubscribe_all() + def reconnect(self): + return self._subscription_manager.reconnect() + def heartbeat(self): return Heartbeat(self) diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 7e3f1f9c..d6398924 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -216,16 +216,8 @@ def add_listener(self, listener): else: raise Exception("Subscription manager is not enabled for this instance") - def request_async(self, options_func, create_response, create_status_response, callback, cancellation_event): - """ - :param options_func: - :param create_response: - :param create_status_response: - :param callback: - :param cancellation_event: - """ - - def async_request(options_func, create_response, create_status_response, cancellation_event, callback): + def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event): + def async_request(endpoint_call_options, cancellation_event, callback): def manage_failures(failure): # Cancelled if failure.type == ConnectingCancelledError: @@ -235,24 +227,26 @@ def manage_failures(failure): else: return failure - request = self.request_deferred(options_func, create_response, create_status_response, cancellation_event) + def options_func(): + return endpoint_call_options + + request = self.request_deferred(options_func, cancellation_event) request.addCallbacks(callback, manage_failures) - self.reactor.callInThread(async_request, - options_func, - create_response, - create_status_response, - cancellation_event, - callback) + self.reactor.callInThread(async_request, endpoint_call_options, cancellation_event, callback) return - def request_deferred(self, options_func, create_response, create_status_response, cancellation_event): + # REVIEW: cancellation_event doesn't used inside function + def request_deferred(self, options_func, cancellation_event): options = options_func() reactor = self.reactor pnconn_pool = self.pnconn_pool headers = self.headers + create_response = options.create_response + create_status_response = options.create_status + url = utils.build_url(self.config.scheme(), self.config.origin, options.path, options.query_string) @@ -365,7 +359,7 @@ def failed(failure): None, None, PubNubException( - errormsg='Connection error', + errormsg=str(failure), pn_error=PNERR_CONNECTION_ERROR, status_code=0 ))) From bfa1741a89214e4457a44ccd213c94fcf1c20557 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Sep 2016 03:34:05 -0700 Subject: [PATCH 348/468] Remove twisted from requirements and test runner --- requirements27-dev.txt | 1 - scripts/run-tests.py | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements27-dev.txt b/requirements27-dev.txt index 64ec8f44..8e5d1e41 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,4 +1,3 @@ -twisted tornado pyopenssl flake8 diff --git a/scripts/run-tests.py b/scripts/run-tests.py index dbea776c..25516a6b 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -14,7 +14,7 @@ pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) -tcmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/integrational/twisted ' +tcmn = 'py.test tests --cov-report=xml --cov=./pubnub ' fcmn = 'flake8 --exclude=src/,.cache,.git,.idea,.tox,._trial_temp/' @@ -29,7 +29,6 @@ def run(command): run( '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 elif version.startswith('2.7') or version.startswith('anaconda2'): - # TODO: remove twisted ignore option when the tests will be ready run("%s,*asyncio*,*python_v35*,examples/" % fcmn) run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.3'): From 82d6991f065debbeb12a88fa62cf6e03fabc315b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 30 Sep 2016 00:36:35 -0700 Subject: [PATCH 349/468] Add Revoke method --- pubnub/endpoints/access/revoke.py | 27 ++++++ pubnub/enums.py | 1 + pubnub/pubnub_core.py | 4 + tests/functional/test_revoke.py | 83 +++++++++++++++++++ tests/integrational/asyncio/test_pam.py | 9 ++ .../fixtures/asyncio/pam/global_level.yaml | 28 +++++-- 6 files changed, 146 insertions(+), 6 deletions(-) create mode 100644 pubnub/endpoints/access/revoke.py create mode 100644 tests/functional/test_revoke.py diff --git a/pubnub/endpoints/access/revoke.py b/pubnub/endpoints/access/revoke.py new file mode 100644 index 00000000..65313b58 --- /dev/null +++ b/pubnub/endpoints/access/revoke.py @@ -0,0 +1,27 @@ +from pubnub.endpoints.access.grant import Grant +from pubnub.enums import PNOperationType + + +class Revoke(Grant): + def __init__(self, pubnub): + Grant.__init__(self, pubnub) + self._read = False + self._write = False + self._manage = False + + self._sort_params = True + + def read(self, flag): + raise NotImplementedError + + def write(self, flag): + raise NotImplementedError + + def manage(self, flag): + raise NotImplementedError + + def operation_type(self): + return PNOperationType.PNAccessManagerRevoke + + def name(self): + return "Revoke" diff --git a/pubnub/enums.py b/pubnub/enums.py index 7243eedc..04407d21 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -54,6 +54,7 @@ class PNOperationType(object): PNGetState = 19 PNAccessManagerAudit = 20 PNAccessManagerGrant = 21 + PNAccessManagerRevoke = 22 class PNHeartbeatNotificationOptions(object): diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index c2576d36..6078f5f6 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -10,6 +10,7 @@ from .endpoints.history import History from .endpoints.access.audit import Audit from .endpoints.access.grant import Grant +from .endpoints.access.revoke import Revoke from .endpoints.channel_groups.add_channel_to_channel_group import AddChannelToChannelGroup from .endpoints.channel_groups.list_channels_in_channel_group import ListChannelsInChannelGroup from .endpoints.channel_groups.remove_channel_from_channel_group import RemoveChannelFromChannelGroup @@ -126,6 +127,9 @@ def publish(self): def grant(self): return Grant(self) + def revoke(self): + return Revoke(self) + def audit(self): return Audit(self) diff --git a/tests/functional/test_revoke.py b/tests/functional/test_revoke.py new file mode 100644 index 00000000..6ed638d4 --- /dev/null +++ b/tests/functional/test_revoke.py @@ -0,0 +1,83 @@ +import unittest + +from pubnub import utils +from pubnub.endpoints.access.revoke import Revoke + +try: + from mock import MagicMock +except ImportError: + from unittest.mock import MagicMock + +from pubnub.pubnub import PubNub +from tests.helper import pnconf_pam, sdk_name + + +class TestRevoke(unittest.TestCase): + def setUp(self): + self.pubnub = MagicMock( + spec=PubNub, + config=pnconf_pam, + sdk_name=sdk_name, + timestamp=MagicMock(return_value=123), + uuid=None + ) + self.pubnub.uuid = "UUID_RevokeUnitTest" + self.revoke = Revoke(self.pubnub) + + def test_revoke_to_channel(self): + self.revoke.channels('ch') + + self.assertEquals(self.revoke.build_path(), Revoke.GRANT_PATH % pnconf_pam.subscribe_key) + + self.assertEqual(self.revoke.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'timestamp': '123', + 'channel': 'ch', + 'r': '0', + 'w': '0', + 'm': '0', + 'signature': utils.sign_sha256(pnconf_pam.secret_key, + pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + "grant\n" + utils.prepare_pam_arguments({ + 'timestamp': 123, + 'channel': 'ch', + 'r': '0', + 'w': '0', + 'm': '0', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + })) + }) + + def test_revoke_read_to_channel(self): + def revoke(): + self.revoke.channels('ch').read(True).write(True) + + self.assertRaises(NotImplementedError, revoke) + + def test_grant_read_and_write_to_channel_group(self): + self.revoke.channel_groups(['gr1', 'gr2']) + + self.assertEquals(self.revoke.build_path(), Revoke.GRANT_PATH % pnconf_pam.subscribe_key) + + self.assertEqual(self.revoke.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid, + 'r': '0', + 'w': '0', + 'm': '0', + 'timestamp': '123', + 'channel-group': 'gr1,gr2', + 'signature': utils.sign_sha256(pnconf_pam.secret_key, + pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + "grant\n" + utils.prepare_pam_arguments({ + 'r': '0', + 'w': '0', + 'm': '0', + 'timestamp': 123, + 'channel-group': 'gr1,gr2', + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + })) + }) diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index b54f349c..35158b73 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -35,6 +35,15 @@ def test_global_level(event_loop): assert env.result.write_enabled is True assert env.result.manage_enabled is False + env = yield from pubnub.revoke().future() + + assert isinstance(env.result, PNAccessManagerGrantResult) + assert len(env.result.channels) == 0 + assert len(env.result.groups) == 0 + assert env.result.read_enabled is False + assert env.result.write_enabled is False + assert env.result.manage_enabled is False + pubnub.stop() diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index 99dd6115..0385c408 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -11,10 +11,10 @@ interactions: headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:19 GMT'} + CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=s6I6O_HXhrgRZzktnFBiuMzOo3HtQ_7KNocH7X8f1Hw=×tamp=1471423639&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 - request: body: null headers: @@ -27,8 +27,24 @@ interactions: headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:19 GMT'} + CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PJGrON0IoRDTRvohroHUTNIAVb6emRTUZ0tc5dJ1I4M=×tamp=1471423639&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=0&uuid=my_uuid&w=0 + response: + body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access + Manager","status":200}'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 30 Sep 2016 07:28:50 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 version: 1 From 92b19e09eff994cb181db30db69e17a504fbb54a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 30 Sep 2016 00:48:46 -0700 Subject: [PATCH 350/468] Add missing Grant.ttl() method --- pubnub/endpoints/access/grant.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index 264a4f5d..c2fa3875 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -47,6 +47,9 @@ def manage(self, flag): self._manage = flag return self + def ttl(self, ttl): + self._ttl = ttl + def build_params(self): params = self.default_params() From 4c7ad926187cbfa241eb22c9c21a3db205ff04c1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 30 Sep 2016 01:08:36 -0700 Subject: [PATCH 351/468] Fix ttl setter --- pubnub/endpoints/access/grant.py | 3 ++- tests/functional/test_grant.py | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index c2fa3875..56f1cef5 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -49,6 +49,7 @@ def manage(self, flag): def ttl(self, ttl): self._ttl = ttl + return self def build_params(self): params = self.default_params() @@ -72,7 +73,7 @@ def build_params(self): params['channel-group'] = utils.join_items_and_encode(self._groups) if self._ttl is not None: - params['ttl'] = int(self._ttl) + params['ttl'] = str(int(self._ttl)) params['timestamp'] = str(self.pubnub.timestamp()) diff --git a/tests/functional/test_grant.py b/tests/functional/test_grant.py index b92dceba..50882971 100644 --- a/tests/functional/test_grant.py +++ b/tests/functional/test_grant.py @@ -25,7 +25,7 @@ def setUp(self): self.grant = Grant(self.pubnub) def test_grant_read_and_write_to_channel(self): - self.grant.channels('ch').read(True).write(True) + self.grant.channels('ch').read(True).write(True).ttl(7) self.assertEquals(self.grant.build_path(), Grant.GRANT_PATH % pnconf_pam.subscribe_key) @@ -34,6 +34,7 @@ def test_grant_read_and_write_to_channel(self): 'uuid': self.pubnub.uuid, 'r': '1', 'w': '1', + 'ttl': '7', 'timestamp': '123', 'channel': 'ch', 'signature': utils.sign_sha256(pnconf_pam.secret_key, @@ -41,6 +42,7 @@ def test_grant_read_and_write_to_channel(self): "grant\n" + utils.prepare_pam_arguments({ 'r': '1', 'w': '1', + 'ttl': '7', 'timestamp': 123, 'channel': 'ch', 'pnsdk': sdk_name, From 22b801f092377e611e8f690a7c81d981feb24ca7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 1 Oct 2016 09:41:40 -0700 Subject: [PATCH 352/468] Fix status.is_error() method --- pubnub/models/consumer/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/models/consumer/common.py b/pubnub/models/consumer/common.py index 5baf4f40..71ef301d 100644 --- a/pubnub/models/consumer/common.py +++ b/pubnub/models/consumer/common.py @@ -19,4 +19,4 @@ def __init__(self): self.affected_groups = None def is_error(self): - return self.error + return self.error is not None From 6667bb44f4cb17f258802638cac146d342c523eb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 1 Oct 2016 11:35:21 -0700 Subject: [PATCH 353/468] Add auth_key to default_params --- pubnub/endpoints/access/audit.py | 3 +++ pubnub/endpoints/access/grant.py | 3 +++ .../channel_groups/add_channel_to_channel_group.py | 3 +++ .../channel_groups/list_channels_in_channel_group.py | 3 +++ .../remove_channel_from_channel_group.py | 3 +++ .../endpoints/channel_groups/remove_channel_group.py | 3 +++ pubnub/endpoints/endpoint.py | 10 +++++++++- pubnub/endpoints/history.py | 3 +++ pubnub/endpoints/presence/get_state.py | 3 +++ pubnub/endpoints/presence/heartbeat.py | 3 +++ pubnub/endpoints/presence/here_now.py | 3 +++ pubnub/endpoints/presence/leave.py | 3 +++ pubnub/endpoints/presence/set_state.py | 3 +++ pubnub/endpoints/presence/where_now.py | 3 +++ pubnub/endpoints/pubsub/publish.py | 3 +++ pubnub/endpoints/pubsub/subscribe.py | 3 +++ pubnub/endpoints/push/add_channels_to_push.py | 3 +++ pubnub/endpoints/push/list_push_provisions.py | 3 +++ pubnub/endpoints/push/remove_channels_from_push.py | 3 +++ pubnub/endpoints/push/remove_device.py | 3 +++ pubnub/endpoints/time.py | 3 +++ tests/functional/test_publish.py | 1 - 22 files changed, 69 insertions(+), 2 deletions(-) diff --git a/pubnub/endpoints/access/audit.py b/pubnub/endpoints/access/audit.py index 4b5ece3a..ce2bc942 100644 --- a/pubnub/endpoints/access/audit.py +++ b/pubnub/endpoints/access/audit.py @@ -73,6 +73,9 @@ def validate_params(self): def create_response(self, envelope): return PNAccessManagerAuditResult.from_json(envelope['payload']) + def is_auth_required(self): + return False + def affected_channels(self): return self._channels diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index 56f1cef5..76a758e4 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -105,6 +105,9 @@ def validate_params(self): def create_response(self, envelope): return PNAccessManagerGrantResult.from_json(envelope['payload']) + def is_auth_required(self): + return False + def affected_channels(self): return self._channels diff --git a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py index a335915a..4e935779 100644 --- a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py +++ b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py @@ -54,6 +54,9 @@ def validate_params(self): or len(self._channel_group) == 0: raise PubNubException(pn_error=PNERR_GROUP_MISSING) + def is_auth_required(self): + return True + def create_response(self, envelope): return PNChannelGroupsAddChannelResult() diff --git a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py index 28d68f29..123955c9 100644 --- a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py +++ b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py @@ -43,6 +43,9 @@ def create_response(self, envelope): else: return PNChannelGroupsListResult([]) + def is_auth_required(self): + return True + def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py index 094db3a0..c6573636 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py @@ -54,6 +54,9 @@ def validate_params(self): or len(self._channel_group) == 0: raise PubNubException(pn_error=PNERR_GROUP_MISSING) + def is_auth_required(self): + return True + def create_response(self, envelope): return PNChannelGroupsRemoveChannelResult() diff --git a/pubnub/endpoints/channel_groups/remove_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_group.py index e0228cf9..9f466ccb 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_group.py @@ -37,6 +37,9 @@ def validate_params(self): or len(self._channel_group) == 0: raise PubNubException(pn_error=PNERR_GROUP_MISSING) + def is_auth_required(self): + return True + def create_response(self, envelope): return PNChannelGroupsRemoveGroupResult() diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index df35b4d1..53fb4c6b 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -65,6 +65,9 @@ def request_timeout(self): def connect_timeout(self): pass + def is_auth_required(self): + raise NotImplementedError + def affected_channels(self): return None @@ -127,11 +130,16 @@ def handler(): cancellation_event=self._cancellation_event) def default_params(self): - return { + default = { 'pnsdk': utils.url_encode(self.pubnub.sdk_name), 'uuid': self.pubnub.uuid } + if self.is_auth_required() and self.pubnub.config.auth_key is not None: + default['auth'] = self.pubnub.config.auth_key + + return default + def validate_subscribe_key(self): if self.pubnub.config.subscribe_key is None or len(self.pubnub.config.subscribe_key) == 0: raise PubNubException(pn_error=PNERR_SUBSCRIBE_KEY_MISSING) diff --git a/pubnub/endpoints/history.py b/pubnub/endpoints/history.py index 6b012352..7b70f1a2 100644 --- a/pubnub/endpoints/history.py +++ b/pubnub/endpoints/history.py @@ -79,6 +79,9 @@ def build_path(self): def http_method(self): return HttpMethod.GET + def is_auth_required(self): + return True + def validate_params(self): self.validate_subscribe_key() self.validate_channel() diff --git a/pubnub/endpoints/presence/get_state.py b/pubnub/endpoints/presence/get_state.py index 558f3edc..d896b5b6 100644 --- a/pubnub/endpoints/presence/get_state.py +++ b/pubnub/endpoints/presence/get_state.py @@ -52,6 +52,9 @@ def create_response(self, envelope): return PNGetStateResult(channels) + def is_auth_required(self): + return True + def affected_channels(self): return self._channels diff --git a/pubnub/endpoints/presence/heartbeat.py b/pubnub/endpoints/presence/heartbeat.py index 3aaf605e..e6eef0b2 100644 --- a/pubnub/endpoints/presence/heartbeat.py +++ b/pubnub/endpoints/presence/heartbeat.py @@ -59,6 +59,9 @@ def build_params(self): def create_response(self, envelope): return True + def is_auth_required(self): + return True + def affected_channels(self): return None diff --git a/pubnub/endpoints/presence/here_now.py b/pubnub/endpoints/presence/here_now.py index 7bad78f3..d336ba24 100644 --- a/pubnub/endpoints/presence/here_now.py +++ b/pubnub/endpoints/presence/here_now.py @@ -58,6 +58,9 @@ def http_method(self): def validate_params(self): self.validate_subscribe_key() + def is_auth_required(self): + return True + def create_response(self, envelope): return PNHereNowResult.from_json(envelope, self._channels) diff --git a/pubnub/endpoints/presence/leave.py b/pubnub/endpoints/presence/leave.py index c3926843..097f7f9a 100644 --- a/pubnub/endpoints/presence/leave.py +++ b/pubnub/endpoints/presence/leave.py @@ -53,6 +53,9 @@ def validate_params(self): def create_response(self, envelope): return envelope + def is_auth_required(self): + return True + def affected_channels(self): return self._channels diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index 0b95ad04..07eab7a5 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -75,6 +75,9 @@ def create_response(self, envelope): else: return envelope + def is_auth_required(self): + return True + def affected_channels(self): return self._channels diff --git a/pubnub/endpoints/presence/where_now.py b/pubnub/endpoints/presence/where_now.py index 80928cbf..a131ce80 100644 --- a/pubnub/endpoints/presence/where_now.py +++ b/pubnub/endpoints/presence/where_now.py @@ -34,6 +34,9 @@ def validate_params(self): if self._uuid is None or not isinstance(self._uuid, six.string_types): raise PubNubException(pn_error=PNERR_UUID_MISSING) + def is_auth_required(self): + return True + def create_response(self, envelope): return PNWhereNowResult.from_json(envelope) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index fa0a234f..41655567 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -114,6 +114,9 @@ def create_response(self, envelope): return res + def is_auth_required(self): + return True + def affected_channels(self): return None diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index 231be767..8997a94c 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -80,6 +80,9 @@ def build_params(self): def create_response(self, envelope): return envelope + def is_auth_required(self): + return True + def affected_channels(self): return None diff --git a/pubnub/endpoints/push/add_channels_to_push.py b/pubnub/endpoints/push/add_channels_to_push.py index 741c900f..0a92490f 100644 --- a/pubnub/endpoints/push/add_channels_to_push.py +++ b/pubnub/endpoints/push/add_channels_to_push.py @@ -60,6 +60,9 @@ def validate_params(self): def create_response(self, envelope): return PNPushAddChannelResult() + def is_auth_required(self): + return True + def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/push/list_push_provisions.py b/pubnub/endpoints/push/list_push_provisions.py index 768847fd..f1fc927e 100644 --- a/pubnub/endpoints/push/list_push_provisions.py +++ b/pubnub/endpoints/push/list_push_provisions.py @@ -54,6 +54,9 @@ def create_response(self, envelope): else: return PNPushListProvisionsResult([]) + def is_auth_required(self): + return True + def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/push/remove_channels_from_push.py b/pubnub/endpoints/push/remove_channels_from_push.py index 3b14b7d8..c6d2b0b9 100644 --- a/pubnub/endpoints/push/remove_channels_from_push.py +++ b/pubnub/endpoints/push/remove_channels_from_push.py @@ -60,6 +60,9 @@ def validate_params(self): def create_response(self, envelope): return PNPushRemoveChannelResult() + def is_auth_required(self): + return True + def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/push/remove_device.py b/pubnub/endpoints/push/remove_device.py index 05c8898b..4b942071 100644 --- a/pubnub/endpoints/push/remove_device.py +++ b/pubnub/endpoints/push/remove_device.py @@ -51,6 +51,9 @@ def validate_params(self): def create_response(self, envelope): return PNPushRemoveAllChannelsResult() + def is_auth_required(self): + return True + def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/time.py b/pubnub/endpoints/time.py index fb7ba97f..b1aa6a5b 100644 --- a/pubnub/endpoints/time.py +++ b/pubnub/endpoints/time.py @@ -18,6 +18,9 @@ def http_method(self): def validate_params(self): pass + def is_auth_required(self): + return False + def create_response(self, envelope): return PNTimeResponse(envelope) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 594f515a..3c89fc82 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -125,7 +125,6 @@ def test_pub_with_auth(self): encoded_message = url_encode(message) pub.channel("ch1").message(message) - print(pub.build_path()) self.assertEquals(pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) From 33e83d04359f2820cfa03cf5c91ee81b4e2031d3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 8 Oct 2016 12:43:35 -0700 Subject: [PATCH 354/468] Add async endpoint wrapper for asyncio --- pubnub/pubnub_asyncio.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 35079576..9b90b66c 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -60,8 +60,20 @@ def sdk_platform(self): def request_sync(self, *args): raise NotImplementedError - def request_async(self, *args): - raise NotImplementedError + def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event, custom_loop=None): + loop = self.event_loop + + if custom_loop is not None: + loop = custom_loop + + future = self.request_future(options_func=endpoint_call_options, + create_response=endpoint_call_options.create_response, + create_status_response=endpoint_call_options.create_status, + cancellation_event=cancellation_event + ) + + task = asyncio.ensure_future(future, loop=loop) + return task.add_done_callback(callback) def request_deferred(self, *args): raise NotImplementedError From 264c26ec7453eba470d60716c6b85fbdfc1ac1fe Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 8 Oct 2016 15:30:06 -0700 Subject: [PATCH 355/468] Fix native 400/403 errors handling. Add tests --- pubnub/request_handlers/requests_handler.py | 2 +- tests/integrational/asyncio/test_publish.py | 13 ++- .../asyncio/publish/not_permitted.yaml | 20 ++++ .../native_sync/history/not_permitted.yaml | 26 +++++ .../tornado/publish/not_permitted.yaml | 98 +++++++++++++++++++ .../integrational/native_sync/test_history.py | 18 +++- .../native_threads/test_publish.py | 16 ++- tests/integrational/tornado/test_publish.py | 13 ++- 8 files changed, 200 insertions(+), 6 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/publish/not_permitted.yaml create mode 100644 tests/integrational/fixtures/native_sync/history/not_permitted.yaml create mode 100644 tests/integrational/fixtures/tornado/publish/not_permitted.yaml diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index 13e8cef4..ad22a822 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -133,7 +133,7 @@ def _build_envelope(self, p_options, e_options): err = PNERR_CLIENT_ERROR return Envelope( - result=e_options.create_response(res.json()), + result=None, status=e_options.create_status( category=status_category, response=res.json(), diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index c8741f8f..e9a13292 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -9,7 +9,7 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException -from tests.helper import pnconf_copy, pnconf_enc_copy, gen_decrypt_func +from tests.helper import pnconf_copy, pnconf_enc_copy, gen_decrypt_func, pnconf_pam_copy from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) @@ -229,3 +229,14 @@ def test_error_invalid_key(event_loop): yield from assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "Invalid Key") pubnub.stop() + + +@pn_vcr.use_cassette( + 'tests/integrational/fixtures/asyncio/publish/not_permitted.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_not_permitted(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + + yield from assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "HTTP Client Error (403") + pubnub.stop() diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml new file mode 100644 index 00000000..e18cd083 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -0,0 +1,20 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + response: + body: {string: '{"message":"Forbidden","payload":{"channels":["asyncio-int-publish"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Sat, + 08 Oct 2016 22:17:08 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} + status: {code: 403, message: Forbidden} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=5b8bcd4c-23ea-4deb-913c-94a3e22a43ce +version: 1 diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml new file mode 100644 index 00000000..7cb51b48 --- /dev/null +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -0,0 +1,26 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + response: + body: {string: '{"message":"Forbidden","payload":{"channels":["history-native-sync-ch"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: + Access-Control-Allow-Headers: ['Origin, X-Requested-With, Content-Type, Accept'] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Cache-Control: ['no-cache, no-store, must-revalidate'] + Connection: [keep-alive] + Content-Type: [text/javascript; charset=UTF-8] + Date: ['Sat, 08 Oct 2016 21:54:31 GMT'] + X-Blocks-Enabled: ['0'] + status: {code: 403, message: Forbidden} +version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml new file mode 100644 index 00000000..43314261 --- /dev/null +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -0,0 +1,98 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Sat, 08 Oct 2016 22:27:54 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset=UTF-8] + - !!python/tuple + - Server + - [nginx] + - !!python/tuple + - X-Consumed-Content-Encoding + - [gzip] + - !!python/tuple + - Access-Control-Allow-Headers + - ['Origin, X-Requested-With, Content-Type, Accept'] + - !!python/tuple + - X-Blocks-Enabled + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Transfer-Encoding + - [chunked] + - !!python/tuple + - Cache-Control + - ['no-cache, no-store, must-revalidate'] + status: {code: 403, message: Forbidden} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=f6efd00c-f770-414d-a628-67055d80dc33 +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + response: + body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Date + - ['Sat, 08 Oct 2016 22:27:54 GMT'] + - !!python/tuple + - Content-Type + - [text/javascript; charset=UTF-8] + - !!python/tuple + - Server + - [nginx] + - !!python/tuple + - X-Consumed-Content-Encoding + - [gzip] + - !!python/tuple + - Access-Control-Allow-Headers + - ['Origin, X-Requested-With, Content-Type, Accept'] + - !!python/tuple + - X-Blocks-Enabled + - ['0'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Transfer-Encoding + - [chunked] + - !!python/tuple + - Cache-Control + - ['no-cache, no-store, must-revalidate'] + status: {code: 403, message: Forbidden} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=f6efd00c-f770-414d-a628-67055d80dc33 +version: 1 diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 60bde711..94c56f38 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -2,11 +2,14 @@ import time import unittest +import pytest +from pubnub.exceptions import PubNubException + import pubnub from pubnub.models.consumer.history import PNHistoryResult from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub -from tests.helper import pnconf_copy, pnconf_enc_copy +from tests.helper import pnconf_copy, pnconf_enc_copy, pnconf_pam_copy from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep_native pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -14,7 +17,7 @@ COUNT = 5 -class TestPubNubState(unittest.TestCase): +class TestPubNubHistory(unittest.TestCase): @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/basic.yaml', filter_query_parameters=['uuid']) def test_basic(self): @@ -68,3 +71,14 @@ def test_encrypted(self): assert envelope.result.messages[2].entry == 'hey-2' assert envelope.result.messages[3].entry == 'hey-3' assert envelope.result.messages[4].entry == 'hey-4' + + @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/not_permitted.yaml', + filter_query_parameters=['uuid']) + def test_not_permitted(self): + ch = "history-native-sync-ch" + pubnub = PubNub(pnconf_pam_copy()) + pubnub.config.uuid = "history-native-sync-uuid" + + with pytest.raises(PubNubException): + pubnub.history().channel(ch).count(5).sync() + diff --git a/tests/integrational/native_threads/test_publish.py b/tests/integrational/native_threads/test_publish.py index 8767b51c..2d967802 100644 --- a/tests/integrational/native_threads/test_publish.py +++ b/tests/integrational/native_threads/test_publish.py @@ -7,7 +7,7 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub -from tests.helper import pnconf, pnconf_enc +from tests.helper import pnconf, pnconf_enc, pnconf_pam_copy pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -185,3 +185,17 @@ def method(): assert self.status.is_error() assert self.response is None assert "not JSON serializable" in str(self.status.error_data.exception) + + def test_not_permitted(self): + PubNub(pnconf_pam_copy()).publish() \ + .channel("not_permitted_channel") \ + .message("correct message") \ + .async(self.callback) + + self.event.wait() + + assert self.status.is_error() + assert self.response is None + assert "HTTP Client Error (403)" in str(self.status.error_data.exception) + assert "Forbidden" in str(self.status.error_data.exception) + assert "Access Manager" in str(self.status.error_data.exception) \ No newline at end of file diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 5bfcfd05..955054e2 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -10,7 +10,7 @@ from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope, PubNubTornadoException -from tests.helper import pnconf, pnconf_enc, gen_decrypt_func +from tests.helper import pnconf, pnconf_enc, gen_decrypt_func, pnconf_pam_copy from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) @@ -214,6 +214,17 @@ def test_error_invalid_key(self): self.assert_server_side_error(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") self.assert_server_side_error_yield(self.pubnub.publish().channel(ch).message("hey"), "Invalid Key") + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/tornado/publish/not_permitted.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_error_not_permitted_403(self): + self.pubnub = PubNubTornado(pnconf_pam_copy(), custom_ioloop=self.io_loop) + + self.assert_server_side_error( + self.pubnub.publish().channel("not_permitted_channel").message("hey"), "HTTP Client Error (403)") + self.assert_server_side_error_yield( + self.pubnub.publish().channel("not_permitted_channel").message("hey"), "HTTP Client Error (403)") + @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/meta_object.yaml', filter_query_parameters=['uuid', 'seqn'], From 55103cb161159e0c9b2f689359d55371e881ea45 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 8 Oct 2016 15:38:56 -0700 Subject: [PATCH 356/468] Fix pep8 errors --- tests/integrational/native_sync/test_history.py | 1 - tests/integrational/native_threads/test_publish.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 94c56f38..6c6c7e4e 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -81,4 +81,3 @@ def test_not_permitted(self): with pytest.raises(PubNubException): pubnub.history().channel(ch).count(5).sync() - diff --git a/tests/integrational/native_threads/test_publish.py b/tests/integrational/native_threads/test_publish.py index 2d967802..02cf42b9 100644 --- a/tests/integrational/native_threads/test_publish.py +++ b/tests/integrational/native_threads/test_publish.py @@ -198,4 +198,4 @@ def test_not_permitted(self): assert self.response is None assert "HTTP Client Error (403)" in str(self.status.error_data.exception) assert "Forbidden" in str(self.status.error_data.exception) - assert "Access Manager" in str(self.status.error_data.exception) \ No newline at end of file + assert "Access Manager" in str(self.status.error_data.exception) From 3c3e6e931ab6d489afec180678b1f41192e7c0e3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 8 Oct 2016 16:26:56 -0700 Subject: [PATCH 357/468] Add default uuid value for where_now request --- pubnub/endpoints/presence/where_now.py | 2 +- tests/functional/test_where_now.py | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/pubnub/endpoints/presence/where_now.py b/pubnub/endpoints/presence/where_now.py index a131ce80..b371699f 100644 --- a/pubnub/endpoints/presence/where_now.py +++ b/pubnub/endpoints/presence/where_now.py @@ -13,7 +13,7 @@ class WhereNow(Endpoint): def __init__(self, pubnub): Endpoint.__init__(self, pubnub) - self._uuid = None + self._uuid = pubnub.config.uuid def uuid(self, uuid): self._uuid = uuid diff --git a/tests/functional/test_where_now.py b/tests/functional/test_where_now.py index 0dfdd255..6960ef68 100644 --- a/tests/functional/test_where_now.py +++ b/tests/functional/test_where_now.py @@ -7,17 +7,17 @@ from pubnub.endpoints.presence.where_now import WhereNow from pubnub.pubnub import PubNub -from tests.helper import pnconf, sdk_name +from tests.helper import pnconf, sdk_name, pnconf_copy class TestWhereNow(unittest.TestCase): def setUp(self): self.pubnub = MagicMock( spec=PubNub, - config=pnconf, + config=pnconf_copy(), sdk_name=sdk_name ) - self.pubnub.uuid = "UUID_WhereNowTest" + self.pubnub.config.uuid = "UUID_WhereNowTest" self.where_now = WhereNow(self.pubnub) def test_where_now(self): @@ -30,3 +30,12 @@ def test_where_now(self): 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) + + def test_where_now_no_uuid(self): + self.assertEquals(self.where_now.build_path(), WhereNow.WHERE_NOW_PATH + % (pnconf.subscribe_key, self.pubnub.config.uuid)) + + self.assertEqual(self.where_now.build_params(), { + 'pnsdk': sdk_name, + 'uuid': self.pubnub.uuid + }) From f6c6073497f57dca813accc0660733da2f2c29b2 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 14:11:51 -0700 Subject: [PATCH 358/468] Migrate to channel&subscription --- pubnub/models/consumer/pubsub.py | 33 ++++++++++++------- pubnub/pubnub.py | 4 +-- pubnub/pubnub_asyncio.py | 4 +-- pubnub/pubnub_tornado.py | 4 +-- pubnub/utils.py | 10 ++++++ pubnub/workers.py | 25 ++++++++++---- tests/integrational/asyncio/test_heartbeat.py | 6 ++-- tests/integrational/asyncio/test_subscribe.py | 33 +++++++++---------- .../native_threads/test_heartbeat.py | 6 ++-- .../native_threads/test_subscribe.py | 23 +++++++------ .../test_asyncio_async_await_syntax.py | 4 +-- .../test_tornado_async_await_syntax.py | 4 +-- tests/integrational/tornado/test_heartbeat.py | 6 ++-- tests/integrational/tornado/test_subscribe.py | 27 ++++++++------- 14 files changed, 109 insertions(+), 80 deletions(-) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index b71a159b..bacfe242 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -2,33 +2,39 @@ class PNMessageResult(object): - def __init__(self, message, subscribed_channel, actual_channel, timetoken, user_metadata=None): + def __init__(self, message, subscription, channel, timetoken, user_metadata=None): assert message is not None - assert isinstance(subscribed_channel, six.string_types) - if actual_channel is not None: - assert isinstance(actual_channel, six.string_types) + if subscription is not None: + assert isinstance(subscription, six.string_types) + if channel is not None: + assert isinstance(channel, six.string_types) assert isinstance(timetoken, six.integer_types) if user_metadata is not None: assert isinstance(user_metadata, object) self.message = message - # RENAME: Confusing name (can be channel, wildcard channel or group) - self.subscribed_channel = subscribed_channel - self.actual_channel = actual_channel + # DEPRECATED: subscribed_channel and actual_channel properties are deprecated + # self.subscribed_channel = subscribed_channel <= now known as subscription + # self.actual_channel = actual_channel <= now known as channel + + self.channel = channel + self.subscription = subscription + self.timetoken = timetoken self.user_metadata = user_metadata class PNPresenceEventResult(object): - def __init__(self, event, uuid, timestamp, occupancy, subscribed_channel, actual_channel, + def __init__(self, event, uuid, timestamp, occupancy, subscription, channel, timetoken, user_metadata=None): + # TODO: add state field assert isinstance(event, six.string_types) assert isinstance(uuid, six.string_types) assert isinstance(timestamp, six.integer_types) assert isinstance(occupancy, six.integer_types) - assert isinstance(actual_channel, six.string_types) + assert isinstance(channel, six.string_types) assert isinstance(timetoken, six.integer_types) if user_metadata is not None: @@ -38,8 +44,13 @@ def __init__(self, event, uuid, timestamp, occupancy, subscribed_channel, actual self.uuid = uuid self.timestamp = timestamp self.occupancy = occupancy - self.subscribed_channel = subscribed_channel - self.actual_channel = actual_channel + + # DEPRECATED: subscribed_channel and actual_channel properties are deprecated + # self.subscribed_channel = subscribed_channel <= now known as subscription + # self.actual_channel = actual_channel <= now known as channel + self.subscription = subscription + self.channel = channel + self.timetoken = timetoken self.user_metadata = user_metadata diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index df4d0007..c4691219 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -297,7 +297,7 @@ def wait_for_message_on(self, *channel_names): while True: env = self.message_queue.get() self.message_queue.task_done() - if env.actual_channel in channel_names: + if env.channel in channel_names: return env else: continue @@ -307,7 +307,7 @@ def wait_for_presence_on(self, *channel_names): while True: env = self.presence_queue.get() self.presence_queue.task_done() - if env.actual_channel[:-7] in channel_names: + if env.channel in channel_names: return env else: continue diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 9b90b66c..278ae6b7 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -474,7 +474,7 @@ def wait_for_message_on(self, *channel_names): while True: try: env = yield from self.message_queue.get() - if env.actual_channel in channel_names: + if env.channel in channel_names: return env else: continue @@ -487,7 +487,7 @@ def wait_for_presence_on(self, *channel_names): while True: try: env = yield from self.presence_queue.get() - if env.actual_channel[:-7] in channel_names: + if env.channel in channel_names: return env else: continue diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index d7cc7c09..f3630ce2 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -439,7 +439,7 @@ def wait_for_message_on(self, *channel_names): while True: try: env = yield self.message_queue.get() - if env.actual_channel in channel_names: + if env.channel in channel_names: raise tornado.gen.Return(env) else: continue @@ -452,7 +452,7 @@ def wait_for_presence_on(self, *channel_names): while True: try: env = yield self.presence_queue.get() - if env.actual_channel[:-7] in channel_names: + if env.channel in channel_names: raise tornado.gen.Return(env) else: continue diff --git a/pubnub/utils.py b/pubnub/utils.py index 6a2bbf02..127eb617 100644 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -2,11 +2,14 @@ import json import uuid as u import threading + try: from hashlib import sha256 + digestmod = sha256 except ImportError: import Crypto.Hash.SHA256 as digestmod + sha256 = digestmod.new import six @@ -153,3 +156,10 @@ def push_type_to_string(push_type): return "mpns" else: return "" + + +def strip_right(text, suffix): + if not text.endswith(suffix): + return text + + return text[:len(text) - len(suffix)] diff --git a/pubnub/workers.py b/pubnub/workers.py index 0318d1ce..814946b2 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -2,6 +2,7 @@ from . import crypto as pn_crypto from abc import abstractmethod +from .utils import strip_right from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult from .models.server.subscribe import SubscribeMessage, PresenceEnvelope @@ -40,12 +41,25 @@ def _process_incoming_payload(self, message): subscription_match = message.subscription_match publish_meta_data = message.publish_metadata + if channel is not None and channel == subscription_match: + subscription_match = None + if "-pnpres" in message.channel: presence_payload = PresenceEnvelope.from_json_payload(message.payload) + + stripped_presence_channel = None + stripped_presence_subscription = None + + if channel is not None: + stripped_presence_channel = strip_right(channel, "-pnpres") + + if subscription_match is not None: + stripped_presence_subscription = strip_right(subscription_match, "-pnpres") + pn_presence_event_result = PNPresenceEventResult( event=presence_payload.action, - actual_channel=(channel if subscription_match is not None else None), - subscribed_channel=(subscription_match if subscription_match is not None else channel), + channel=stripped_presence_channel, + subscription=stripped_presence_subscription, timetoken=publish_meta_data.publish_timetoken, occupancy=presence_payload.occupancy, uuid=presence_payload.uuid, @@ -60,12 +74,9 @@ def _process_incoming_payload(self, message): pn_message_result = PNMessageResult( message=extracted_message, - actual_channel=(channel if subscription_match is not None else None), - subscribed_channel=(subscription_match if subscription_match is not None else channel), + channel=channel, + subscription=subscription_match, timetoken=publish_meta_data.publish_timetoken ) - if message.only_channel_subscription: - pn_message_result.actual_channel = pn_message_result.subscribed_channel - self._listener_manager.announce_message(pn_message_result) diff --git a/tests/integrational/asyncio/test_heartbeat.py b/tests/integrational/asyncio/test_heartbeat.py index e0ff4f07..71bb000b 100644 --- a/tests/integrational/asyncio/test_heartbeat.py +++ b/tests/integrational/asyncio/test_heartbeat.py @@ -35,7 +35,7 @@ def test_timeout_event_on_broken_heartbeat(event_loop): yield from callback_presence.wait_for_connect() envelope = yield from callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == envelope.actual_channel + assert ch == envelope.channel assert 'join' == envelope.event assert pubnub_listener.uuid == envelope.uuid @@ -52,7 +52,7 @@ def test_timeout_event_on_broken_heartbeat(event_loop): prs_envelope = presence_future.result() - assert ch + "-pnpres" == prs_envelope.actual_channel + assert ch == prs_envelope.channel assert 'join' == prs_envelope.event assert pubnub.uuid == prs_envelope.uuid @@ -64,7 +64,7 @@ def test_timeout_event_on_broken_heartbeat(event_loop): # - assert for timeout envelope = yield from callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == envelope.actual_channel + assert ch == envelope.channel assert 'timeout' == envelope.event assert pubnub.uuid == envelope.uuid diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 9916b530..95d0e504 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -68,8 +68,8 @@ def test_subscribe_publish_unsubscribe(event_loop): subscribe_envelope = subscribe_message_future.result() assert isinstance(subscribe_envelope, PNMessageResult) - assert subscribe_envelope.actual_channel == channel - assert subscribe_envelope.subscribed_channel == channel + assert subscribe_envelope.channel == channel + assert subscribe_envelope.subscription is None assert subscribe_envelope.message == message assert subscribe_envelope.timetoken > 0 @@ -109,8 +109,8 @@ def test_encrypted_subscribe_publish_unsubscribe(event_loop): subscribe_envelope = subscribe_message_future.result() assert isinstance(subscribe_envelope, PNMessageResult) - assert subscribe_envelope.actual_channel == channel - assert subscribe_envelope.subscribed_channel == channel + assert subscribe_envelope.channel == channel + assert subscribe_envelope.subscription is None assert subscribe_envelope.message == message assert subscribe_envelope.timetoken > 0 @@ -126,9 +126,8 @@ def test_encrypted_subscribe_publish_unsubscribe(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/join_leave.yaml') @pytest.mark.asyncio -def test_join_leave_blah(event_loop): +def test_join_leave(event_loop): channel = "test-subscribe-asyncio-join-leave-ch" - presence_channel = "%s-pnpres" % channel pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -145,7 +144,7 @@ def test_join_leave_blah(event_loop): yield from callback_presence.wait_for_connect() envelope = yield from callback_presence.wait_for_presence_on(channel) - assert envelope.actual_channel == presence_channel + assert envelope.channel == channel assert envelope.event == 'join' assert envelope.uuid == pubnub_listener.uuid @@ -154,7 +153,7 @@ def test_join_leave_blah(event_loop): yield from callback_messages.wait_for_connect() envelope = yield from callback_presence.wait_for_presence_on(channel) - assert envelope.actual_channel == presence_channel + assert envelope.channel == channel assert envelope.event == 'join' assert envelope.uuid == pubnub.uuid @@ -162,7 +161,7 @@ def test_join_leave_blah(event_loop): yield from callback_messages.wait_for_disconnect() envelope = yield from callback_presence.wait_for_presence_on(channel) - assert envelope.actual_channel == presence_channel + assert envelope.channel == channel assert envelope.event == 'leave' assert envelope.uuid == pubnub.uuid @@ -233,8 +232,8 @@ def test_cg_subscribe_publish_unsubscribe(event_loop, sleeper=asyncio.sleep): assert pub_envelope.status.original_response[0] == 1 assert pub_envelope.status.original_response[1] == 'Sent' - assert sub_envelope.actual_channel == ch - assert sub_envelope.subscribed_channel == gr + assert sub_envelope.channel == ch + assert sub_envelope.subscription == gr assert sub_envelope.message == message pubnub.unsubscribe().channel_groups(gr).execute() @@ -274,8 +273,8 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): prs_envelope = yield from callback_presence.wait_for_presence_on(ch) assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub_listener.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() @@ -287,8 +286,8 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr pubnub.unsubscribe().channel_groups(gr).execute() @@ -299,8 +298,8 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): assert prs_envelope.event == 'leave' assert prs_envelope.uuid == pubnub.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr pubnub_listener.unsubscribe().channel_groups(gr).execute() yield from callback_presence.wait_for_disconnect() diff --git a/tests/integrational/native_threads/test_heartbeat.py b/tests/integrational/native_threads/test_heartbeat.py index 3f2386e5..f8bc977a 100644 --- a/tests/integrational/native_threads/test_heartbeat.py +++ b/tests/integrational/native_threads/test_heartbeat.py @@ -39,7 +39,7 @@ def test_timeout_event_on_broken_heartbeat(self): callback_presence.wait_for_connect() presence_message = callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == presence_message.actual_channel + assert ch == presence_message.channel assert 'join' == presence_message.event assert pubnub_listener.uuid == presence_message.uuid @@ -49,7 +49,7 @@ def test_timeout_event_on_broken_heartbeat(self): callback_messages.wait_for_connect() prs_envelope = callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == prs_envelope.actual_channel + assert ch == prs_envelope.channel assert 'join' == prs_envelope.event assert pubnub.uuid == prs_envelope.uuid @@ -61,7 +61,7 @@ def test_timeout_event_on_broken_heartbeat(self): # - assert for timeout presence_message = callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == presence_message.actual_channel + assert ch == presence_message.channel assert 'timeout' == presence_message.event assert pubnub.uuid == presence_message.uuid diff --git a/tests/integrational/native_threads/test_subscribe.py b/tests/integrational/native_threads/test_subscribe.py index 764cffac..8d9c6692 100644 --- a/tests/integrational/native_threads/test_subscribe.py +++ b/tests/integrational/native_threads/test_subscribe.py @@ -68,8 +68,8 @@ def test_subscribe_pub_unsubscribe(self): result = subscribe_listener.wait_for_message_on(ch) assert isinstance(result, PNMessageResult) - assert result.actual_channel == ch - assert result.subscribed_channel == ch + assert result.channel == ch + assert result.subscription is None assert result.timetoken > 0 assert result.message == message @@ -82,7 +82,6 @@ def test_subscribe_pub_unsubscribe(self): def test_join_leave(self): ch = helper.gen_channel("test-subscribe-join-leave") - ch_pnpres = ch + "-pnpres" pubnub = PubNub(pnconf_sub_copy()) pubnub_listener = PubNub(pnconf_sub_copy()) @@ -100,7 +99,7 @@ def test_join_leave(self): callback_presence.wait_for_connect() envelope = callback_presence.wait_for_presence_on(ch) - assert envelope.actual_channel == ch_pnpres + assert envelope.channel == ch assert envelope.event == 'join' assert envelope.uuid == pubnub_listener.uuid @@ -108,7 +107,7 @@ def test_join_leave(self): callback_messages.wait_for_connect() envelope = callback_presence.wait_for_presence_on(ch) - assert envelope.actual_channel == ch_pnpres + assert envelope.channel == ch assert envelope.event == 'join' assert envelope.uuid == pubnub.uuid @@ -116,7 +115,7 @@ def test_join_leave(self): callback_messages.wait_for_disconnect() envelope = callback_presence.wait_for_presence_on(ch) - assert envelope.actual_channel == ch_pnpres + assert envelope.channel == ch assert envelope.event == 'leave' assert envelope.uuid == pubnub.uuid @@ -228,8 +227,8 @@ def test_subscribe_cg_join_leave(self): prs_envelope = callback_presence.wait_for_presence_on(ch) assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub_listener.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() @@ -238,16 +237,16 @@ def test_subscribe_cg_join_leave(self): assert prs_envelope.event == 'join' assert prs_envelope.uuid == pubnub.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr pubnub.unsubscribe().channel_groups(gr).execute() prs_envelope = callback_presence.wait_for_presence_on(ch) assert prs_envelope.event == 'leave' assert prs_envelope.uuid == pubnub.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr pubnub_listener.unsubscribe().channel_groups(gr).execute() callback_presence.wait_for_disconnect() diff --git a/tests/integrational/python_v35/test_asyncio_async_await_syntax.py b/tests/integrational/python_v35/test_asyncio_async_await_syntax.py index 28180e52..7c5481d1 100644 --- a/tests/integrational/python_v35/test_asyncio_async_await_syntax.py +++ b/tests/integrational/python_v35/test_asyncio_async_await_syntax.py @@ -35,8 +35,8 @@ async def test_subscribe_publish_unsubscribe(event_loop): subscribe_envelope = subscribe_message_future.result() assert isinstance(subscribe_envelope, PNMessageResult) - assert subscribe_envelope.actual_channel == channel - assert subscribe_envelope.subscribed_channel == channel + assert subscribe_envelope.channel == channel + assert subscribe_envelope.subscription is None assert subscribe_envelope.message == message assert subscribe_envelope.timetoken > 0 diff --git a/tests/integrational/python_v35/test_tornado_async_await_syntax.py b/tests/integrational/python_v35/test_tornado_async_await_syntax.py index 5796d229..cf742d16 100644 --- a/tests/integrational/python_v35/test_tornado_async_await_syntax.py +++ b/tests/integrational/python_v35/test_tornado_async_await_syntax.py @@ -40,8 +40,8 @@ async def test_subscribe_publish_unsubscribe(self): assert pub_env.status.original_response[0] == 1 assert pub_env.status.original_response[1] == 'Sent' - assert sub_env.actual_channel == ch - assert sub_env.subscribed_channel == ch + assert sub_env.channel == ch + assert sub_env.subscription is None assert sub_env.message == message self.pubnub.unsubscribe().channels(ch).execute() diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py index 3e0a18bb..f7e22353 100644 --- a/tests/integrational/tornado/test_heartbeat.py +++ b/tests/integrational/tornado/test_heartbeat.py @@ -52,7 +52,7 @@ def test_timeout_event_on_broken_heartbeat(self): yield callback_presence.wait_for_connect() envelope = yield callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == envelope.actual_channel + assert ch == envelope.channel assert 'join' == envelope.event assert self.pubnub_listener.uuid == envelope.uuid @@ -65,7 +65,7 @@ def test_timeout_event_on_broken_heartbeat(self): useless, prs_envelope = yield [ callback_messages.wait_for_connect(), callback_presence.wait_for_presence_on(ch)] - assert ch + "-pnpres" == prs_envelope.actual_channel + assert ch == prs_envelope.channel assert 'join' == prs_envelope.event assert self.pubnub.uuid == prs_envelope.uuid @@ -77,7 +77,7 @@ def test_timeout_event_on_broken_heartbeat(self): # - assert for timeout envelope = yield callback_presence.wait_for_presence_on(ch) - assert ch + "-pnpres" == envelope.actual_channel + assert ch == envelope.channel assert 'timeout' == envelope.event assert self.pubnub.uuid == envelope.uuid diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 65fc88e1..115fb81b 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -74,8 +74,8 @@ def test_subscribe_publish_unsubscribe(self): assert pub_env.status.original_response[0] == 1 assert pub_env.status.original_response[1] == 'Sent' - assert sub_env.actual_channel == ch - assert sub_env.subscribed_channel == ch + assert sub_env.channel == ch + assert sub_env.subscription is None assert sub_env.message == message self.pubnub.unsubscribe().channels(ch).execute() @@ -87,7 +87,6 @@ def test_subscribe_publish_unsubscribe(self): @tornado.testing.gen_test(timeout=15) def test_join_leave(self): ch = "subscribe-tornado-ch" - ch_pnpres = ch + "-pnpres" self.pubnub.config.uuid = "subscribe-tornado-messenger" self.pubnub_listener.config.uuid = "subscribe-tornado-listener" @@ -97,7 +96,7 @@ def test_join_leave(self): yield callback_presence.wait_for_connect() envelope = yield callback_presence.wait_for_presence_on(ch) - assert envelope.actual_channel == ch_pnpres + assert envelope.channel == ch assert envelope.event == 'join' assert envelope.uuid == self.pubnub_listener.uuid @@ -107,7 +106,7 @@ def test_join_leave(self): yield callback_messages.wait_for_connect() envelope = yield callback_presence.wait_for_presence_on(ch) - assert envelope.actual_channel == ch_pnpres + assert envelope.channel == ch assert envelope.event == 'join' assert envelope.uuid == self.pubnub.uuid @@ -115,7 +114,7 @@ def test_join_leave(self): yield callback_messages.wait_for_disconnect() envelope = yield callback_presence.wait_for_presence_on(ch) - assert envelope.actual_channel == ch_pnpres + assert envelope.channel == ch assert envelope.event == 'leave' assert envelope.uuid == self.pubnub.uuid @@ -181,8 +180,8 @@ def test_group_subscribe_publish_unsubscribe(self): assert pub_envelope.status.original_response[0] == 1 assert pub_envelope.status.original_response[1] == 'Sent' - assert sub_envelope.actual_channel == ch - assert sub_envelope.subscribed_channel == gr + assert sub_envelope.channel == ch + assert sub_envelope.subscription == gr assert sub_envelope.message == message self.pubnub.unsubscribe().channel_groups(gr).execute() @@ -217,8 +216,8 @@ def test_group_join_leave(self): prs_envelope = yield callback_presence.wait_for_presence_on(ch) assert prs_envelope.event == 'join' assert prs_envelope.uuid == self.pubnub_listener.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr self.pubnub.add_listener(callback_messages) self.pubnub.subscribe().channel_groups(gr).execute() @@ -230,8 +229,8 @@ def test_group_join_leave(self): assert prs_envelope.event == 'join' assert prs_envelope.uuid == self.pubnub.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr self.pubnub.unsubscribe().channel_groups(gr).execute() @@ -242,8 +241,8 @@ def test_group_join_leave(self): assert prs_envelope.event == 'leave' assert prs_envelope.uuid == self.pubnub.uuid - assert prs_envelope.actual_channel == ch + "-pnpres" - assert prs_envelope.subscribed_channel == gr + "-pnpres" + assert prs_envelope.channel == ch + assert prs_envelope.subscription == gr self.pubnub_listener.unsubscribe().channel_groups(gr).execute() yield callback_presence.wait_for_disconnect() From 3606ffce5421459b7c953f24be8046d5be8b5797 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 14:31:56 -0700 Subject: [PATCH 359/468] Reconfigure tests runner --- scripts/run-tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 25516a6b..27756356 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -35,7 +35,7 @@ def run(command): run("%s,*asyncio*,*python_v35*" % fcmn) run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.4'): - run("%s,*python_v35*" % fcmn) + run("%s,*python_v35*,examples" % fcmn) run('%s--ignore=tests/integrational/python_v35/ ' % tcmn) elif version.startswith('3.5'): run(fcmn) @@ -44,7 +44,7 @@ def run(command): run(fcmn) run(tcmn) elif version.startswith('pypy'): - run("%s,*asyncio*,*python_v35*" % fcmn) + run("%s,*asyncio*,*python_v35*,examples" % fcmn) run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) else: raise Exception("Version %s is not supported by this script runner" % version) From 5ae2502f9a36bbdd0e89b260bd2818e767ce7873 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 14:52:26 -0700 Subject: [PATCH 360/468] Add state field to PNPresenceEventResult --- pubnub/models/consumer/pubsub.py | 7 +++++-- pubnub/workers.py | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index bacfe242..f54d6f1e 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -27,9 +27,8 @@ def __init__(self, message, subscription, channel, timetoken, user_metadata=None class PNPresenceEventResult(object): def __init__(self, event, uuid, timestamp, occupancy, subscription, channel, - timetoken, user_metadata=None): + timetoken, state, user_metadata=None): - # TODO: add state field assert isinstance(event, six.string_types) assert isinstance(uuid, six.string_types) assert isinstance(timestamp, six.integer_types) @@ -40,10 +39,14 @@ def __init__(self, event, uuid, timestamp, occupancy, subscription, channel, if user_metadata is not None: assert isinstance(user_metadata, object) + if state is not None: + assert isinstance(user_metadata, dict) + self.event = event self.uuid = uuid self.timestamp = timestamp self.occupancy = occupancy + self.state = state # DEPRECATED: subscribed_channel and actual_channel properties are deprecated # self.subscribed_channel = subscribed_channel <= now known as subscription diff --git a/pubnub/workers.py b/pubnub/workers.py index 814946b2..f984b461 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -63,7 +63,8 @@ def _process_incoming_payload(self, message): timetoken=publish_meta_data.publish_timetoken, occupancy=presence_payload.occupancy, uuid=presence_payload.uuid, - timestamp=presence_payload.timestamp + timestamp=presence_payload.timestamp, + state=presence_payload.data ) self._listener_manager.announce_presence(pn_presence_event_result) else: From 98c3f3d9e680101c0f385d4bb62e6e8c05428983 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 15:00:39 -0700 Subject: [PATCH 361/468] Rename create_status_response() => create_status() --- pubnub/endpoints/endpoint.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 53fb4c6b..72f3f684 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -78,7 +78,7 @@ def options(self): return RequestOptions(self.build_path(), self.build_params(), self.http_method(), self.request_timeout(), self.connect_timeout(), self.create_response, - self.create_status_response, + self.create_status, self.operation_type(), self.build_data(), self._sort_params) @@ -97,7 +97,7 @@ def async(self, callback): self.validate_params() options = self.options() except PubNubException as e: - callback(None, self.create_status_response(PNStatusCategory.PNBadRequestCategory, None, None, e)) + callback(None, self.create_status(PNStatusCategory.PNBadRequestCategory, None, None, e)) return def callback_wrapper(envelope): @@ -117,7 +117,7 @@ def handler(): return self.pubnub.request_future(options_func=handler, # REVIEW: self.create_* persists inside self.options, remove? create_response=self.create_response, - create_status_response=self.create_status_response, + create_status_response=self.create_status, cancellation_event=self._cancellation_event ) @@ -160,8 +160,7 @@ def validate_publish_key(self): if self.pubnub.config.publish_key is None or len(self.pubnub.config.publish_key) == 0: raise PubNubException(pn_error=PNERR_PUBLISH_KEY_MISSING) - def create_status_response(self, category, response, response_info, exception): - # TODO: rename to create_status + def create_status(self, category, response, response_info, exception): if response_info is not None: assert isinstance(response_info, ResponseInfo) From 8862a357ba5ea51f3c2268e49c918e279b229b9a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 15:02:14 -0700 Subject: [PATCH 362/468] Remove resolved TODO for SetState --- pubnub/endpoints/presence/set_state.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index 07eab7a5..b293fc20 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -7,8 +7,6 @@ from pubnub.models.consumer.presence import PNSetStateResult -# TODO: save state inside internal key/val storage - class SetState(Endpoint): # /v2/presence/sub-key//channel//uuid//data?state= SET_STATE_PATH = "/v2/presence/sub-key/%s/channel/%s/uuid/%s/data" From ee654177ec89ee4fd6cdc1250df9ed14f1b6e26b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 15:13:06 -0700 Subject: [PATCH 363/468] Remove unused check for None --- pubnub/models/server/subscribe.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 311ac3e6..2d64cde3 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -12,9 +12,7 @@ def __init__(self, messages=None, metadata=None): @classmethod def from_json(cls, json_input): messages = [] - if json_input is None: - # TODO: handle - print("blah") + for raw_message in json_input['m']: messages.append(SubscribeMessage.from_json(raw_message)) From b14d1922d962daefd4114840146c1735eb496fd0 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 15:18:28 -0700 Subject: [PATCH 364/468] Add async request exception logging --- pubnub/request_handlers/requests_handler.py | 3 ++- pubnub/request_handlers/urllib2_handler.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index ad22a822..e723881b 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -39,6 +39,7 @@ def callback_to_invoke_in_another_thread(): callback(envelope) except PubNubException as e: + logger.error("Async request PubNubException. %s" % str(e)) callback(Envelope( result=None, status=endpoint_call_options.create_status( @@ -47,7 +48,7 @@ def callback_to_invoke_in_another_thread(): response_info=None, exception=e))) except Exception as e: - # TODO: log the exception + logger.error("Async request Exception. %s" % str(e)) callback(Envelope( result=None, status=endpoint_call_options.create_status( diff --git a/pubnub/request_handlers/urllib2_handler.py b/pubnub/request_handlers/urllib2_handler.py index e51d3b17..4924ccc8 100644 --- a/pubnub/request_handlers/urllib2_handler.py +++ b/pubnub/request_handlers/urllib2_handler.py @@ -46,6 +46,7 @@ def callback_to_invoke_in_another_thread(): callback(envelope) except PubNubException as e: + logger.error("Async request PubNubException. %s" % str(e)) callback(Envelope( result=None, status=endpoint_call_options.create_status( @@ -54,7 +55,7 @@ def callback_to_invoke_in_another_thread(): response_info=None, exception=e))) except Exception as e: - # TODO: log the exception + logger.error("Async request Exception. %s" % str(e)) callback(Envelope( result=None, status=endpoint_call_options.create_status( From dd1790b5dbcf7b9bd6e5a4cdc8ade4f30b23f034 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 9 Oct 2016 15:21:13 -0700 Subject: [PATCH 365/468] Remove obsolete TODO --- pubnub/models/server/subscribe.py | 1 - 1 file changed, 1 deletion(-) diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 2d64cde3..489c8cc0 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -92,7 +92,6 @@ def from_json_payload(cls, json): ) -# TODO: refactor this file to server.py class PublishMetadata: def __init__(self, publish_timetoken=None, region=None): self.publish_timetoken = publish_timetoken From 3e5133397238a192d248601c21cd1e805667a75a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 10 Oct 2016 04:17:16 -0700 Subject: [PATCH 366/468] Add BasePath manager --- pubnub/managers.py | 26 +++++++++++++++++++++ pubnub/pubnub.py | 2 +- pubnub/pubnub_asyncio.py | 4 ++-- pubnub/pubnub_core.py | 7 +++++- pubnub/pubnub_tornado.py | 2 +- pubnub/pubnub_twisted.py | 2 +- pubnub/request_handlers/requests_handler.py | 15 +++++++----- pubnub/request_handlers/urllib2_handler.py | 10 ++++---- 8 files changed, 51 insertions(+), 17 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index 0f2f7d6a..e1a3ef5a 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -23,6 +23,32 @@ def get_next_sequence(self): return self.next_sequence +class BasePathManager(object): + MAX_SUBDOMAIN = 20 + DEFAULT_SUBDOMAIN = "pubsub" + DEFAULT_BASE_PATH = "pubnub.com" + + def __init__(self, initial_config): + self.config = initial_config + self._current_subdomain = 1 + + def get_base_path(self): + if self.config.origin is not None: + return self.config.origin + # TODO: should CacheBusting be used? + elif False: + constructed_url = ("ps%s.%s" % (self._current_subdomain, BasePathManager.DEFAULT_BASE_PATH)) + + if self._current_subdomain == BasePathManager.MAX_SUBDOMAIN: + self._current_subdomain = 1 + else: + self._current_subdomain += 1 + + return constructed_url + else: + return "%s.%s" % (BasePathManager.DEFAULT_SUBDOMAIN, BasePathManager.DEFAULT_BASE_PATH) + + class StateManager(object): def __init__(self): self._channels = {} diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index c4691219..9528202f 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -28,7 +28,7 @@ class PubNub(PubNubCore): def __init__(self, config): assert isinstance(config, PNConfiguration) - self._request_handler = RequestsRequestHandler() + self._request_handler = RequestsRequestHandler(self) PubNubCore.__init__(self, config) if self.config.enable_subscribe: diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 278ae6b7..dcc86fde 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -89,8 +89,8 @@ def request_future(self, options_func, create_response, if options.operation_type is PNOperationType.PNPublishOperation: options.params['seqn'] = yield from self._publish_sequence_manager.get_next_sequence() - url = utils.build_url(self.config.scheme(), self.config.origin, options.path) - log_url = utils.build_url(self.config.scheme(), self.config.origin, + url = utils.build_url(self.config.scheme(), self.base_origin, options.path) + log_url = utils.build_url(self.config.scheme(), self.base_origin, options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, log_url, options.data)) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 6078f5f6..3a779452 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -3,7 +3,7 @@ from abc import ABCMeta, abstractmethod - +from .managers import BasePathManager from .builders import SubscribeBuilder from .builders import UnsubscribeBuilder from .endpoints.time import Time @@ -49,6 +49,11 @@ def __init__(self, config): self._subscription_manager = None self._publish_sequence_manager = None + self._base_path_manager = BasePathManager(config) + + @property + def base_origin(self): + return self._base_path_manager.get_base_path() @property def sdk_name(self): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index f3630ce2..2e00f83f 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -96,7 +96,7 @@ def request_future(self, options_func, create_response, future = Future() - url = utils.build_url(self.config.scheme(), self.config.origin, + url = utils.build_url(self.config.scheme(), self.base_origin, options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, url, options.data)) diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index d6398924..bd3aa4e2 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -247,7 +247,7 @@ def request_deferred(self, options_func, cancellation_event): create_response = options.create_response create_status_response = options.create_status - url = utils.build_url(self.config.scheme(), self.config.origin, + url = utils.build_url(self.config.scheme(), self.base_origin, options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, url, options.data)) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index e723881b..eecc7c4e 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -20,8 +20,9 @@ class RequestsRequestHandler(BaseRequestHandler): """ PubNub Python SDK Native requests handler based on `requests` HTTP library. """ ENDPOINT_THREAD_COUNTER = 0 - def __init__(self): + def __init__(self, pubnub): self.session = Session() + self.pubnub = pubnub def sync_request(self, platform_options, endpoint_call_options): return self._build_envelope(platform_options, endpoint_call_options) @@ -80,7 +81,7 @@ def _build_envelope(self, p_options, e_options): response_info = None try: - res = self._invoke_request(p_options, e_options) + res = self._invoke_request(p_options, e_options, self.pubnub.base_origin) except PubNubException as e: if e._pn_error is PNERR_CONNECTION_ERROR: status_category = PNStatusCategory.PNUnexpectedDisconnectCategory @@ -153,11 +154,11 @@ def _build_envelope(self, p_options, e_options): response_info=response_info, exception=None)) - def _invoke_request(self, p_options, e_options): + def _invoke_request(self, p_options, e_options, base_origin): assert isinstance(p_options, PlatformOptions) assert isinstance(e_options, RequestOptions) - url = p_options.pn_config.scheme_and_host() + e_options.path + url = p_options.pn_config.scheme() + "://" + base_origin + e_options.path args = { "method": e_options.method_string, @@ -172,14 +173,16 @@ def _invoke_request(self, p_options, e_options): logger.debug("%s %s %s" % ( e_options.method_string, utils.build_url( - p_options.pn_config.scheme_and_host(), + p_options.pn_config.scheme(), + base_origin, e_options.path, e_options.query_string), e_options.data)) else: logger.debug("%s %s" % ( e_options.method_string, utils.build_url( - p_options.pn_config.scheme_and_host(), + p_options.pn_config.scheme(), + base_origin, e_options.path, e_options.query_string))) diff --git a/pubnub/request_handlers/urllib2_handler.py b/pubnub/request_handlers/urllib2_handler.py index 4924ccc8..a808b950 100644 --- a/pubnub/request_handlers/urllib2_handler.py +++ b/pubnub/request_handlers/urllib2_handler.py @@ -27,8 +27,8 @@ class Urllib2RequestHandler(BaseRequestHandler): """ ENDPOINT_THREAD_COUNTER = 0 - def __init__(self): - pass + def __init__(self, pubnub): + self.pubnub = pubnub def sync_request(self, platform_options, endpoint_call_options): return self._build_envelope(platform_options, endpoint_call_options) @@ -87,7 +87,7 @@ def _build_envelope(self, p_options, e_options): response_info = None try: - res = self._invoke_request(p_options, e_options) + res = self._invoke_request(p_options, e_options, self.pubnub.base_origin) except PubNubException as e: if e._pn_error is PNERR_CONNECTION_ERROR: status_category = PNStatusCategory.PNUnexpectedDisconnectCategory @@ -166,11 +166,11 @@ def _build_envelope(self, p_options, e_options): exception=None)) @staticmethod - def _invoke_request(p_options, e_options): + def _invoke_request(p_options, e_options, base_origin): assert isinstance(p_options, PlatformOptions) assert isinstance(e_options, RequestOptions) - url = utils.build_url(p_options.pn_config.scheme(), p_options.pn_config.origin, + url = utils.build_url(p_options.pn_config.scheme(), base_origin, e_options.path, e_options.query_string) args = { From 027b84957f2b95d4a8b39b7b9ae3c75ac5089a47 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 14 Oct 2016 04:44:05 -0700 Subject: [PATCH 367/468] Fix access denied status assignment --- pubnub/pubnub_asyncio.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index dcc86fde..37482fc0 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -274,6 +274,9 @@ def _start_subscribe_loop(self): except PubNubAsyncioException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: self._pubnub.event_loop.call_soon(self._start_subscribe_loop) + elif e.status is not None and e.status.category == PNStatusCategory.PNAccessDeniedCategory: + e.status.operation = PNOperationType.PNUnsubscribeOperation + self._listener_manager.announce_status(e.status) else: self._listener_manager.announce_status(e.status) except asyncio.CancelledError: From 56900ef1ef98a2fb57f34e74e136e3e5044738de Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 16 Oct 2016 15:55:03 -0700 Subject: [PATCH 368/468] Add all requests signing option --- pubnub/endpoints/access/audit.py | 19 +----- pubnub/endpoints/access/grant.py | 17 +---- .../add_channel_to_channel_group.py | 8 +-- .../list_channels_in_channel_group.py | 4 +- .../remove_channel_from_channel_group.py | 8 +-- .../channel_groups/remove_channel_group.py | 4 +- pubnub/endpoints/endpoint.py | 66 +++++++++++++------ pubnub/endpoints/history.py | 4 +- pubnub/endpoints/presence/get_state.py | 4 +- pubnub/endpoints/presence/heartbeat.py | 6 +- pubnub/endpoints/presence/here_now.py | 4 +- pubnub/endpoints/presence/leave.py | 4 +- pubnub/endpoints/presence/set_state.py | 6 +- pubnub/endpoints/presence/where_now.py | 4 +- pubnub/endpoints/pubsub/publish.py | 4 +- pubnub/endpoints/pubsub/subscribe.py | 4 +- pubnub/endpoints/push/add_channels_to_push.py | 4 +- pubnub/endpoints/push/list_push_provisions.py | 4 +- .../push/remove_channels_from_push.py | 7 +- pubnub/endpoints/push/remove_device.py | 4 +- pubnub/endpoints/time.py | 2 +- pubnub/pubnub.py | 15 +++-- pubnub/pubnub_asyncio.py | 17 +++-- pubnub/pubnub_core.py | 4 ++ pubnub/pubnub_tornado.py | 14 ++-- pubnub/structures.py | 10 ++- .../push/test_add_channels_to_push.py | 6 +- .../push/test_list_push_provisions.py | 6 +- .../push/test_remove_channels_from_push.py | 6 +- .../push/test_remove_device_from_push.py | 6 +- tests/functional/test_add_channel_to_cg.py | 4 +- tests/functional/test_audit.py | 4 +- tests/functional/test_get_state.py | 4 +- tests/functional/test_grant.py | 4 +- tests/functional/test_heartbeat.py | 10 +-- tests/functional/test_here_now.py | 6 +- tests/functional/test_history.py | 15 +++-- tests/functional/test_leave.py | 16 ++--- tests/functional/test_list_channels_in_cg.py | 2 +- tests/functional/test_publish.py | 14 ++-- tests/functional/test_remove_cg.py | 2 +- .../functional/test_remove_channel_from_cg.py | 4 +- tests/functional/test_revoke.py | 24 ++++--- tests/functional/test_set_state.py | 4 +- tests/functional/test_subscribe.py | 16 ++--- tests/functional/test_where_now.py | 4 +- tests/integrational/asyncio/test_pam.py | 23 +++++++ tests/integrational/asyncio/test_publish.py | 2 +- .../asyncio/pam/sign_non_pam_request.yaml | 20 ++++++ .../asyncio/publish/not_permitted.yaml | 19 ++---- .../fixtures/asyncio/time/get.yaml | 8 +-- .../tornado/publish/not_permitted.yaml | 64 +++++++++--------- .../native_threads/test_publish.py | 5 +- tests/integrational/tornado/test_publish.py | 4 +- 54 files changed, 306 insertions(+), 243 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml diff --git a/pubnub/endpoints/access/audit.py b/pubnub/endpoints/access/audit.py index ce2bc942..c2d4eb80 100644 --- a/pubnub/endpoints/access/audit.py +++ b/pubnub/endpoints/access/audit.py @@ -33,10 +33,8 @@ def channel_groups(self, channel_groups): utils.extend_list(self._groups, channel_groups) return self - def build_params(self): - params = self.default_params() - - signed_input = (self.pubnub.config.subscribe_key + "\n" + self.pubnub.config.publish_key + "\naudit\n") + def custom_params(self): + params = {} if len(self._auth_keys) > 0: params['auth'] = utils.join_items_and_encode(self._auth_keys) @@ -47,17 +45,6 @@ def build_params(self): if len(self._groups) > 0: params['channel-group'] = utils.join_items_and_encode(self._groups) - params['timestamp'] = str(self.pubnub.timestamp()) - - # The SDK version string should be signed unencoded - params_to_sign = copy.copy(params) - params_to_sign['pnsdk'] = self.pubnub.sdk_name - - signed_input += utils.prepare_pam_arguments(params_to_sign) - signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) - - params['signature'] = signature - return params def build_path(self): @@ -89,7 +76,7 @@ def connect_timeout(self): return self.pubnub.config.connect_timeout def operation_type(self): - return PNOperationType.PNAccessManagerGrant + return PNOperationType.PNAccessManagerAudit def name(self): return "Grant" diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index 76a758e4..fba2e6d1 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -51,10 +51,8 @@ def ttl(self, ttl): self._ttl = ttl return self - def build_params(self): - params = self.default_params() - - signed_input = (self.pubnub.config.subscribe_key + "\n" + self.pubnub.config.publish_key + "\ngrant\n") + def custom_params(self): + params = {} if self._read is not None: params['r'] = '1' if self._read is True else '0' @@ -75,17 +73,6 @@ def build_params(self): if self._ttl is not None: params['ttl'] = str(int(self._ttl)) - params['timestamp'] = str(self.pubnub.timestamp()) - - # The SDK version string should be signed unencoded - params_to_sign = copy.copy(params) - params_to_sign['pnsdk'] = self.pubnub.sdk_name - - signed_input += utils.prepare_pam_arguments(params_to_sign) - signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) - - params['signature'] = signature - return params def build_path(self): diff --git a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py index 4e935779..897802e5 100644 --- a/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py +++ b/pubnub/endpoints/channel_groups/add_channel_to_channel_group.py @@ -30,12 +30,8 @@ def channel_group(self, channel_group): return self - def build_params(self): - params = self.default_params() - - params['add'] = utils.join_items(self._channels) - - return params + def custom_params(self): + return {'add': utils.join_items(self._channels)} def build_path(self): return AddChannelToChannelGroup.ADD_PATH % ( diff --git a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py index 123955c9..37aaa8c1 100644 --- a/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py +++ b/pubnub/endpoints/channel_groups/list_channels_in_channel_group.py @@ -20,8 +20,8 @@ def channel_group(self, channel_group): return self - def build_params(self): - return self.default_params() + def custom_params(self): + return {} def build_path(self): return ListChannelsInChannelGroup.LIST_PATH % ( diff --git a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py index c6573636..621daa48 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_from_channel_group.py @@ -30,12 +30,8 @@ def channel_group(self, channel_group): return self - def build_params(self): - params = self.default_params() - - params['remove'] = utils.join_items(self._channels) - - return params + def custom_params(self): + return {'remove': utils.join_items(self._channels)} def build_path(self): return RemoveChannelFromChannelGroup.REMOVE_PATH % ( diff --git a/pubnub/endpoints/channel_groups/remove_channel_group.py b/pubnub/endpoints/channel_groups/remove_channel_group.py index 9f466ccb..ab61ca7f 100644 --- a/pubnub/endpoints/channel_groups/remove_channel_group.py +++ b/pubnub/endpoints/channel_groups/remove_channel_group.py @@ -20,8 +20,8 @@ def channel_group(self, channel_group): return self - def build_params(self): - return self.default_params() + def custom_params(self): + return {} def build_path(self): return RemoveChannelGroup.REMOVE_PATH % ( diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 72f3f684..f5d5009f 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -1,7 +1,7 @@ from abc import ABCMeta, abstractmethod from pubnub import utils -from pubnub.enums import PNStatusCategory +from pubnub.enums import PNStatusCategory, PNOperationType from pubnub.errors import PNERR_SUBSCRIBE_KEY_MISSING, PNERR_PUBLISH_KEY_MISSING, PNERR_CHANNEL_OR_GROUP_MISSING, \ PNERR_SECRET_KEY_MISSING, PNERR_CHANNEL_MISSING from pubnub.exceptions import PubNubException @@ -31,8 +31,8 @@ def build_path(self): pass @abstractmethod - def build_params(self): - pass + def custom_params(self): + raise NotImplementedError def build_data(self): return None @@ -75,12 +75,17 @@ def affected_channels_groups(self): return None def options(self): - return RequestOptions(self.build_path(), self.build_params(), - self.http_method(), self.request_timeout(), - self.connect_timeout(), self.create_response, - self.create_status, - self.operation_type(), - self.build_data(), self._sort_params) + return RequestOptions( + path=self.build_path(), + params_callback=self.build_params_callback(), + method=self.http_method(), + request_timeout=self.request_timeout(), + connect_timeout=self.connect_timeout(), + create_response=self.create_response, + create_status=self.create_status, + operation_type=self.operation_type(), + data=self.build_data(), + sort_arguments=self._sort_params) def sync(self): self.validate_params() @@ -115,9 +120,6 @@ def handler(): return self.options() return self.pubnub.request_future(options_func=handler, - # REVIEW: self.create_* persists inside self.options, remove? - create_response=self.create_response, - create_status_response=self.create_status, cancellation_event=self._cancellation_event ) @@ -129,16 +131,40 @@ def handler(): return self.pubnub.request_deferred(options_func=handler, cancellation_event=self._cancellation_event) - def default_params(self): - default = { - 'pnsdk': utils.url_encode(self.pubnub.sdk_name), - 'uuid': self.pubnub.uuid - } + def build_params_callback(self): + def callback(params_to_merge): + custom_params = self.custom_params() + custom_params.update(params_to_merge) + + custom_params['pnsdk'] = self.pubnub.sdk_name + custom_params['uuid'] = self.pubnub.uuid + + if self.is_auth_required() and self.pubnub.config.auth_key is not None: + custom_params['auth'] = self.pubnub.config.auth_key + + if self.pubnub.config.secret_key is not None: + custom_params['timestamp'] = str(self.pubnub.timestamp()) + signed_input = (self.pubnub.config.subscribe_key + "\n" + self.pubnub.config.publish_key + "\n") + + operation_type = self.operation_type() + if operation_type == PNOperationType.PNAccessManagerAudit: + signed_input += 'audit\n' + elif operation_type == PNOperationType.PNAccessManagerGrant or\ + operation_type == PNOperationType.PNAccessManagerRevoke: + signed_input += 'grant\n' + else: + signed_input += self.build_path() + "\n" + + signed_input += utils.prepare_pam_arguments(custom_params) + signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) + + custom_params['signature'] = signature - if self.is_auth_required() and self.pubnub.config.auth_key is not None: - default['auth'] = self.pubnub.config.auth_key + # reassign since pnsdk should be signed unencoded + custom_params['pnsdk'] = utils.url_encode(self.pubnub.sdk_name) - return default + return custom_params + return callback def validate_subscribe_key(self): if self.pubnub.config.subscribe_key is None or len(self.pubnub.config.subscribe_key) == 0: diff --git a/pubnub/endpoints/history.py b/pubnub/endpoints/history.py index 7b70f1a2..5da3d049 100644 --- a/pubnub/endpoints/history.py +++ b/pubnub/endpoints/history.py @@ -48,8 +48,8 @@ def include_timetoken(self, include_timetoken): self._include_timetoken = include_timetoken return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} if self._start is not None: params['start'] = str(self._start) diff --git a/pubnub/endpoints/presence/get_state.py b/pubnub/endpoints/presence/get_state.py index d896b5b6..5b2ba111 100644 --- a/pubnub/endpoints/presence/get_state.py +++ b/pubnub/endpoints/presence/get_state.py @@ -21,8 +21,8 @@ def channel_groups(self, channel_groups): utils.extend_list(self._groups, channel_groups) return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} if len(self._groups) > 0: params['channel-group'] = utils.join_items(self._groups) diff --git a/pubnub/endpoints/presence/heartbeat.py b/pubnub/endpoints/presence/heartbeat.py index e6eef0b2..3cd2eee6 100644 --- a/pubnub/endpoints/presence/heartbeat.py +++ b/pubnub/endpoints/presence/heartbeat.py @@ -43,10 +43,8 @@ def build_path(self): channels = utils.join_channels(self._channels) return Heartbeat.HEARTBEAT_PATH % (self.pubnub.config.subscribe_key, channels) - def build_params(self): - params = self.default_params() - - params['heartbeat'] = str(self.pubnub.config.presence_timeout) + def custom_params(self): + params = {'heartbeat': str(self.pubnub.config.presence_timeout)} if len(self._groups) > 0: params['channel-group'] = utils.join_items(self._groups) diff --git a/pubnub/endpoints/presence/here_now.py b/pubnub/endpoints/presence/here_now.py index d336ba24..91d152cc 100644 --- a/pubnub/endpoints/presence/here_now.py +++ b/pubnub/endpoints/presence/here_now.py @@ -31,8 +31,8 @@ def include_uuids(self, include_uuids): self._include_uuids = include_uuids return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} if len(self._channel_groups) > 0: params['channel-groups'] = utils.join_items_and_encode(self._channel_groups) diff --git a/pubnub/endpoints/presence/leave.py b/pubnub/endpoints/presence/leave.py index 097f7f9a..8dfe20a0 100644 --- a/pubnub/endpoints/presence/leave.py +++ b/pubnub/endpoints/presence/leave.py @@ -30,8 +30,8 @@ def channel_groups(self, channel_groups): return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} if len(self._groups) > 0: params['channel-group'] = utils.join_items(self._groups) diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index b293fc20..7db347ed 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -30,7 +30,7 @@ def state(self, state): self._state = state return self - def build_params(self): + def custom_params(self): if self._subscription_manager is not None: self._subscription_manager.adapt_state_builder(StateOperation( channels=self._channels, @@ -38,9 +38,7 @@ def build_params(self): state=self._state )) - params = self.default_params() - - params['state'] = utils.url_encode(utils.write_value_as_string(self._state)) + params = {'state': utils.url_encode(utils.write_value_as_string(self._state))} if len(self._groups) > 0: params['channel-group'] = utils.join_items_and_encode(self._groups) diff --git a/pubnub/endpoints/presence/where_now.py b/pubnub/endpoints/presence/where_now.py index b371699f..5de93874 100644 --- a/pubnub/endpoints/presence/where_now.py +++ b/pubnub/endpoints/presence/where_now.py @@ -19,8 +19,8 @@ def uuid(self, uuid): self._uuid = uuid return self - def build_params(self): - return self.default_params() + def custom_params(self): + return {} def build_path(self): return WhereNow.WHERE_NOW_PATH % (self.pubnub.config.subscribe_key, self._uuid) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 41655567..52a8104d 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -50,8 +50,8 @@ def build_data(self): else: return None - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} if self._meta is not None: params['meta'] = utils.url_encode(utils.write_value_as_string(self._meta)) diff --git a/pubnub/endpoints/pubsub/subscribe.py b/pubnub/endpoints/pubsub/subscribe.py index 8997a94c..b00f4adb 100644 --- a/pubnub/endpoints/pubsub/subscribe.py +++ b/pubnub/endpoints/pubsub/subscribe.py @@ -57,8 +57,8 @@ def build_path(self): channels = utils.join_channels(self._channels) return Subscribe.SUBSCRIBE_PATH % (self.pubnub.config.subscribe_key, channels) - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} if len(self._groups) > 0: params['channel-group'] = utils.join_items_and_encode(self._groups) diff --git a/pubnub/endpoints/push/add_channels_to_push.py b/pubnub/endpoints/push/add_channels_to_push.py index 0a92490f..e9764b0a 100644 --- a/pubnub/endpoints/push/add_channels_to_push.py +++ b/pubnub/endpoints/push/add_channels_to_push.py @@ -30,8 +30,8 @@ def push_type(self, push_type): self._push_type = push_type return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} params['add'] = utils.join_items(self._channels) params['type'] = utils.push_type_to_string(self._push_type) diff --git a/pubnub/endpoints/push/list_push_provisions.py b/pubnub/endpoints/push/list_push_provisions.py index f1fc927e..ec8acd34 100644 --- a/pubnub/endpoints/push/list_push_provisions.py +++ b/pubnub/endpoints/push/list_push_provisions.py @@ -25,8 +25,8 @@ def push_type(self, push_type): self._push_type = push_type return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} params['type'] = utils.push_type_to_string(self._push_type) diff --git a/pubnub/endpoints/push/remove_channels_from_push.py b/pubnub/endpoints/push/remove_channels_from_push.py index c6d2b0b9..1610614d 100644 --- a/pubnub/endpoints/push/remove_channels_from_push.py +++ b/pubnub/endpoints/push/remove_channels_from_push.py @@ -30,11 +30,8 @@ def push_type(self, push_type): self._push_type = push_type return self - def build_params(self): - params = self.default_params() - - params['remove'] = utils.join_items(self._channels) - params['type'] = utils.push_type_to_string(self._push_type) + def custom_params(self): + params = {'remove': utils.join_items(self._channels), 'type': utils.push_type_to_string(self._push_type)} return params diff --git a/pubnub/endpoints/push/remove_device.py b/pubnub/endpoints/push/remove_device.py index 4b942071..a258a0b3 100644 --- a/pubnub/endpoints/push/remove_device.py +++ b/pubnub/endpoints/push/remove_device.py @@ -25,8 +25,8 @@ def push_type(self, push_type): self._push_type = push_type return self - def build_params(self): - params = self.default_params() + def custom_params(self): + params = {} params['type'] = utils.push_type_to_string(self._push_type) diff --git a/pubnub/endpoints/time.py b/pubnub/endpoints/time.py index b1aa6a5b..3199ef32 100644 --- a/pubnub/endpoints/time.py +++ b/pubnub/endpoints/time.py @@ -6,7 +6,7 @@ class Time(Endpoint): TIME_PATH = "/time/0" - def build_params(self): + def custom_params(self): return {} def build_path(self): diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 9528202f..ae221c7f 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -46,20 +46,27 @@ def set_request_handler(self, handler): def request_sync(self, endpoint_call_options): platform_options = PlatformOptions(self.headers, self.config) - if endpoint_call_options.operation_type is PNOperationType.PNPublishOperation: - endpoint_call_options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + self.merge_in_params(endpoint_call_options) return self._request_handler.sync_request(platform_options, endpoint_call_options) def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event): platform_options = PlatformOptions(self.headers, self.config) - if endpoint_call_options.operation_type is PNOperationType.PNPublishOperation: - endpoint_call_options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + self.merge_in_params(endpoint_call_options) return self._request_handler.async_request(endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event) + def merge_in_params(self, options): + + params_to_merge_in = {} + + if options.operation_type == PNOperationType.PNPublishOperation: + params_to_merge_in['seqn'] = self._publish_sequence_manager.get_next_sequence() + + options.merge_params_in(params_to_merge_in) + def stop(self): if self._subscription_manager is not None: self._subscription_manager.stop() diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 37482fc0..e4a08438 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -13,7 +13,7 @@ from .workers import SubscribeMessageWorker from .managers import SubscriptionManager, PublishSequenceManager from . import utils -from .structures import ResponseInfo +from .structures import ResponseInfo, RequestOptions from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType from .callbacks import SubscribeCallback from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED @@ -79,15 +79,22 @@ def request_deferred(self, *args): raise NotImplementedError @asyncio.coroutine - def request_future(self, options_func, create_response, - create_status_response, cancellation_event): + def request_future(self, options_func, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) options = options_func() + assert isinstance(options, RequestOptions) - if options.operation_type is PNOperationType.PNPublishOperation: - options.params['seqn'] = yield from self._publish_sequence_manager.get_next_sequence() + create_response = options.create_response + create_status_response = options.create_status + + params_to_merge_in = {} + + if options.operation_type == PNOperationType.PNPublishOperation: + params_to_merge_in['seqn'] = yield from self._publish_sequence_manager.get_next_sequence() + + options.merge_params_in(params_to_merge_in) url = utils.build_url(self.config.scheme(), self.base_origin, options.path) log_url = utils.build_url(self.config.scheme(), self.base_origin, diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 3a779452..3a94b29c 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -59,6 +59,10 @@ def base_origin(self): def sdk_name(self): return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) + @abstractmethod + def publish_sequence_next(self): + pass + @abstractmethod def sdk_platform(self): pass diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 2e00f83f..f31666ba 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -84,15 +84,21 @@ def request_async(self, *args): def request_deferred(self, *args): raise NotImplementedError - def request_future(self, options_func, create_response, - create_status_response, cancellation_event): + def request_future(self, options_func, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) options = options_func() - if options.operation_type is PNOperationType.PNPublishOperation: - options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + create_response = options.create_response + create_status_response = options.create_status + + params_to_merge_in = {} + + if options.operation_type == PNOperationType.PNPublishOperation: + params_to_merge_in['seqn'] = self._publish_sequence_manager.get_next_sequence() + + options.merge_params_in(params_to_merge_in) future = Future() diff --git a/pubnub/structures.py b/pubnub/structures.py index 48214fc6..d9c4f164 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -4,17 +4,18 @@ class RequestOptions(object): - def __init__(self, path, params, method, request_timeout, connect_timeout, create_response, + def __init__(self, path, params_callback, method, request_timeout, connect_timeout, create_response, create_status, operation_type, data=None, sort_arguments=False): assert len(path) > 0 - assert isinstance(params, dict) + assert callable(params_callback) assert isinstance(method, six.integer_types) assert isinstance(request_timeout, six.integer_types) assert isinstance(connect_timeout, six.integer_types) assert method is HttpMethod.GET or method is HttpMethod.POST + self.params = None self.path = path - self.params = params + self.params_callback = params_callback self._method = method self.request_timeout = request_timeout self.connect_timeout = connect_timeout @@ -27,6 +28,9 @@ def __init__(self, path, params, method, request_timeout, connect_timeout, creat self.create_status = create_status self.operation_type = operation_type + def merge_params_in(self, params_to_merge_in): + self.params = self.params_callback(params_to_merge_in) + @property def method_string(self): return HttpMethod.string(self._method) diff --git a/tests/functional/push/test_add_channels_to_push.py b/tests/functional/push/test_add_channels_to_push.py index acc45017..6b3a67d7 100644 --- a/tests/functional/push/test_add_channels_to_push.py +++ b/tests/functional/push/test_add_channels_to_push.py @@ -31,7 +31,7 @@ def test_push_add_single_channel(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params) - self.assertEqual(self.add_channels.build_params(), { + self.assertEqual(self.add_channels.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'apns', @@ -46,7 +46,7 @@ def test_push_add_multiple_channels(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params) - self.assertEqual(self.add_channels.build_params(), { + self.assertEqual(self.add_channels.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'mpns', @@ -61,7 +61,7 @@ def test_push_add_google(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.add_channels.build_path(), AddChannelsToPush.ADD_PATH % params) - self.assertEqual(self.add_channels.build_params(), { + self.assertEqual(self.add_channels.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'gcm', diff --git a/tests/functional/push/test_list_push_provisions.py b/tests/functional/push/test_list_push_provisions.py index d1b3c9df..207641d3 100644 --- a/tests/functional/push/test_list_push_provisions.py +++ b/tests/functional/push/test_list_push_provisions.py @@ -30,7 +30,7 @@ def test_list_channel_group_apns(self): ListPushProvisions.LIST_PATH % ( pnconf.subscribe_key, "coolDevice")) - self.assertEqual(self.list_push.build_params(), { + self.assertEqual(self.list_push.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'apns' @@ -43,7 +43,7 @@ def test_list_channel_group_gcm(self): ListPushProvisions.LIST_PATH % ( pnconf.subscribe_key, "coolDevice")) - self.assertEqual(self.list_push.build_params(), { + self.assertEqual(self.list_push.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'gcm' @@ -56,7 +56,7 @@ def test_list_channel_group_mpns(self): ListPushProvisions.LIST_PATH % ( pnconf.subscribe_key, "coolDevice")) - self.assertEqual(self.list_push.build_params(), { + self.assertEqual(self.list_push.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'mpns' diff --git a/tests/functional/push/test_remove_channels_from_push.py b/tests/functional/push/test_remove_channels_from_push.py index d7f2bf46..16ecd442 100644 --- a/tests/functional/push/test_remove_channels_from_push.py +++ b/tests/functional/push/test_remove_channels_from_push.py @@ -31,7 +31,7 @@ def test_push_remove_single_channel(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) - self.assertEqual(self.remove_channels.build_params(), { + self.assertEqual(self.remove_channels.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'apns', @@ -46,7 +46,7 @@ def test_push_remove_multiple_channels(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) - self.assertEqual(self.remove_channels.build_params(), { + self.assertEqual(self.remove_channels.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'mpns', @@ -62,7 +62,7 @@ def test_push_remove_google(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_channels.build_path(), RemoveChannelsFromPush.REMOVE_PATH % params) - self.assertEqual(self.remove_channels.build_params(), { + self.assertEqual(self.remove_channels.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'gcm', diff --git a/tests/functional/push/test_remove_device_from_push.py b/tests/functional/push/test_remove_device_from_push.py index 883f6cc6..eee18b3c 100644 --- a/tests/functional/push/test_remove_device_from_push.py +++ b/tests/functional/push/test_remove_device_from_push.py @@ -31,7 +31,7 @@ def test_remove_push_apns(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params) - self.assertEqual(self.remove_device.build_params(), { + self.assertEqual(self.remove_device.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'apns', @@ -43,7 +43,7 @@ def test_remove_push_gcm(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params) - self.assertEqual(self.remove_device.build_params(), { + self.assertEqual(self.remove_device.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'gcm', @@ -55,7 +55,7 @@ def test_remove_push_mpns(self): params = (pnconf.subscribe_key, "coolDevice") self.assertEquals(self.remove_device.build_path(), RemoveDeviceFromPush.REMOVE_PATH % params) - self.assertEqual(self.remove_device.build_params(), { + self.assertEqual(self.remove_device.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'type': 'mpns', diff --git a/tests/functional/test_add_channel_to_cg.py b/tests/functional/test_add_channel_to_cg.py index 27db54bc..6fc1636b 100644 --- a/tests/functional/test_add_channel_to_cg.py +++ b/tests/functional/test_add_channel_to_cg.py @@ -29,7 +29,7 @@ def test_add_single_channel(self): AddChannelToChannelGroup.ADD_PATH % ( pnconf.subscribe_key, "gr")) - self.assertEqual(self.add.build_params(), { + self.assertEqual(self.add.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'add': "ch" @@ -44,7 +44,7 @@ def test_add_multiple_channels(self): AddChannelToChannelGroup.ADD_PATH % ( pnconf.subscribe_key, "gr")) - self.assertEqual(self.add.build_params(), { + self.assertEqual(self.add.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'add': "ch1,ch2" diff --git a/tests/functional/test_audit.py b/tests/functional/test_audit.py index ab0d81f3..4d8193ee 100644 --- a/tests/functional/test_audit.py +++ b/tests/functional/test_audit.py @@ -29,7 +29,7 @@ def test_audit_channel(self): self.assertEquals(self.audit.build_path(), Audit.AUDIT_PATH % pnconf_pam.subscribe_key) - self.assertEqual(self.audit.build_params(), { + self.assertEqual(self.audit.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'timestamp': '123', @@ -49,7 +49,7 @@ def test_audit_channel_group(self): self.assertEquals(self.audit.build_path(), Audit.AUDIT_PATH % pnconf_pam.subscribe_key) - self.assertEqual(self.audit.build_params(), { + self.assertEqual(self.audit.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'timestamp': '123', diff --git a/tests/functional/test_get_state.py b/tests/functional/test_get_state.py index c2ef7f29..d1564309 100644 --- a/tests/functional/test_get_state.py +++ b/tests/functional/test_get_state.py @@ -29,7 +29,7 @@ def test_get_state_single_channel(self): "ch", self.pubnub.uuid)) - self.assertEqual(self.get_state.build_params(), { + self.assertEqual(self.get_state.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, }) @@ -43,7 +43,7 @@ def test_get_state_single_group(self): ",", self.pubnub.uuid)) - self.assertEqual(self.get_state.build_params(), { + self.assertEqual(self.get_state.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'channel-group': 'gr' diff --git a/tests/functional/test_grant.py b/tests/functional/test_grant.py index 50882971..4b735157 100644 --- a/tests/functional/test_grant.py +++ b/tests/functional/test_grant.py @@ -29,7 +29,7 @@ def test_grant_read_and_write_to_channel(self): self.assertEquals(self.grant.build_path(), Grant.GRANT_PATH % pnconf_pam.subscribe_key) - self.assertEqual(self.grant.build_params(), { + self.assertEqual(self.grant.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'r': '1', @@ -55,7 +55,7 @@ def test_grant_read_and_write_to_channel_group(self): self.assertEquals(self.grant.build_path(), Grant.GRANT_PATH % pnconf_pam.subscribe_key) - self.assertEqual(self.grant.build_params(), { + self.assertEqual(self.grant.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'r': '1', diff --git a/tests/functional/test_heartbeat.py b/tests/functional/test_heartbeat.py index 56c6bdc2..25554852 100644 --- a/tests/functional/test_heartbeat.py +++ b/tests/functional/test_heartbeat.py @@ -30,7 +30,7 @@ def test_sub_single_channel(self): self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH % (pnconf.subscribe_key, 'ch')) - self.assertEqual(self.hb.build_params(), { + self.assertEqual(self.hb.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'heartbeat': '20' @@ -44,7 +44,7 @@ def test_hb_multiple_channels_using_list(self): self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.hb.build_params(), { + self.assertEqual(self.hb.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'heartbeat': '20' @@ -58,7 +58,7 @@ def test_hb_single_group(self): self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.hb.build_params(), { + self.assertEqual(self.hb.build_params_callback()({}), { 'channel-group': 'gr', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, @@ -73,7 +73,7 @@ def test_hb_multiple_groups_using_list(self): self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.hb.build_params(), { + self.assertEqual(self.hb.build_params_callback()({}), { 'channel-group': 'gr1,gr2,gr3', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, @@ -89,7 +89,7 @@ def test_hb_with_state(self): self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH % (pnconf.subscribe_key, "ch1,ch2")) - self.assertEqual(self.hb.build_params(), { + self.assertEqual(self.hb.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'heartbeat': '20', diff --git a/tests/functional/test_here_now.py b/tests/functional/test_here_now.py index b265d2d2..59b2d0a6 100644 --- a/tests/functional/test_here_now.py +++ b/tests/functional/test_here_now.py @@ -27,7 +27,7 @@ def test_here_now(self): self.assertEquals(self.here_now.build_path(), HereNow.HERE_NOW_PATH % (pnconf.subscribe_key, "ch1")) - self.assertEqual(self.here_now.build_params(), { + self.assertEqual(self.here_now.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -38,7 +38,7 @@ def test_here_now_groups(self): self.assertEquals(self.here_now.build_path(), HereNow.HERE_NOW_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.here_now.build_params(), { + self.assertEqual(self.here_now.build_params_callback()({}), { 'channel-groups': 'gr1', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -50,7 +50,7 @@ def test_here_now_with_options(self): self.assertEquals(self.here_now.build_path(), HereNow.HERE_NOW_PATH % (pnconf.subscribe_key, "ch1")) - self.assertEqual(self.here_now.build_params(), { + self.assertEqual(self.here_now.build_params_callback()({}), { 'channel-groups': 'gr1', 'state': '1', 'disable_uuids': '1', diff --git a/tests/functional/test_history.py b/tests/functional/test_history.py index e6002cf0..f6be3427 100644 --- a/tests/functional/test_history.py +++ b/tests/functional/test_history.py @@ -7,14 +7,17 @@ from pubnub.endpoints.history import History from pubnub.pubnub import PubNub -from tests.helper import pnconf_pam, sdk_name +from tests.helper import pnconf_pam_copy, sdk_name + +pnconf = pnconf_pam_copy() +pnconf.secret_key = None class TestHistory(unittest.TestCase): def setUp(self): self.pubnub = MagicMock( spec=PubNub, - config=pnconf_pam, + config=pnconf, sdk_name=sdk_name, timestamp=MagicMock(return_value=123), uuid=None @@ -25,9 +28,9 @@ def setUp(self): def test_history_basic(self): self.history.channel('ch') - self.assertEquals(self.history.build_path(), History.HISTORY_PATH % (pnconf_pam.subscribe_key, 'ch')) + self.assertEquals(self.history.build_path(), History.HISTORY_PATH % (pnconf.subscribe_key, 'ch')) - self.assertEqual(self.history.build_params(), { + self.assertEqual(self.history.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'count': '100' @@ -36,9 +39,9 @@ def test_history_basic(self): def test_history_full(self): self.history.channel('ch').start(100000).end(200000).reverse(False).count(3).include_timetoken(True) - self.assertEquals(self.history.build_path(), History.HISTORY_PATH % (pnconf_pam.subscribe_key, 'ch')) + self.assertEquals(self.history.build_path(), History.HISTORY_PATH % (pnconf.subscribe_key, 'ch')) - self.assertEqual(self.history.build_params(), { + self.assertEqual(self.history.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'count': '3', diff --git a/tests/functional/test_leave.py b/tests/functional/test_leave.py index dc441097..620c8df7 100644 --- a/tests/functional/test_leave.py +++ b/tests/functional/test_leave.py @@ -27,7 +27,7 @@ def test_leave_single_channel(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -39,7 +39,7 @@ def test_leave_multiple_channels(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -51,7 +51,7 @@ def test_leave_multiple_channels_using_list(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -63,7 +63,7 @@ def test_leave_multiple_channels_using_tuple(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -76,7 +76,7 @@ def test_leave_single_group(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'channel-group': 'gr', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -90,7 +90,7 @@ def test_leave_multiple_groups_using_string(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'channel-group': 'gr1,gr2,gr3', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -104,7 +104,7 @@ def test_leave_multiple_groups_using_list(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'channel-group': 'gr1,gr2,gr3', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -118,7 +118,7 @@ def test_leave_channels_and_groups(self): self.assertEquals(self.leave.build_path(), Leave.LEAVE_PATH % (pnconf.subscribe_key, "ch1,ch2")) - self.assertEqual(self.leave.build_params(), { + self.assertEqual(self.leave.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'channel-group': 'gr1,gr2', diff --git a/tests/functional/test_list_channels_in_cg.py b/tests/functional/test_list_channels_in_cg.py index 09c6eea3..fb3d27de 100644 --- a/tests/functional/test_list_channels_in_cg.py +++ b/tests/functional/test_list_channels_in_cg.py @@ -29,7 +29,7 @@ def test_list_channel_group(self): ListChannelsInChannelGroup.LIST_PATH % ( pnconf.subscribe_key, "gr")) - self.assertEqual(self.list.build_params(), { + self.assertEqual(self.list.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, }) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index 3c89fc82..e6c4845f 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -36,7 +36,7 @@ def test_pub_message(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, }) @@ -52,7 +52,7 @@ def test_pub_list_message(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, }) @@ -69,7 +69,7 @@ def test_pub_with_meta(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'meta': '%5B%22m1%22%2C%20%22m2%22%5D', @@ -86,7 +86,7 @@ def test_pub_store(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'store': '1', @@ -103,7 +103,7 @@ def test_pub_do_not_store(self): self.assertEquals(self.pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(self.pub.build_params(), { + self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'store': '0', @@ -128,7 +128,7 @@ def test_pub_with_auth(self): self.assertEquals(pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(pub.build_params(), { + self.assertEqual(pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': pubnub.uuid, 'auth': conf.auth_key, @@ -155,7 +155,7 @@ def test_pub_encrypted_list_message(self): self.assertEquals(pub.build_path(), "/publish/%s/%s/0/ch1/0/%s" % (pnconf.publish_key, pnconf.subscribe_key, encoded_message)) - self.assertEqual(pub.build_params(), { + self.assertEqual(pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': pubnub.uuid, }) diff --git a/tests/functional/test_remove_cg.py b/tests/functional/test_remove_cg.py index 42bd588b..e4120011 100644 --- a/tests/functional/test_remove_cg.py +++ b/tests/functional/test_remove_cg.py @@ -29,7 +29,7 @@ def test_list_channel_group(self): RemoveChannelGroup.REMOVE_PATH % ( pnconf.subscribe_key, "gr")) - self.assertEqual(self.list.build_params(), { + self.assertEqual(self.list.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, }) diff --git a/tests/functional/test_remove_channel_from_cg.py b/tests/functional/test_remove_channel_from_cg.py index 574e53ef..f0843bce 100644 --- a/tests/functional/test_remove_channel_from_cg.py +++ b/tests/functional/test_remove_channel_from_cg.py @@ -29,7 +29,7 @@ def test_remove_single_channel(self): RemoveChannelFromChannelGroup.REMOVE_PATH % ( pnconf.subscribe_key, "gr")) - self.assertEqual(self.remove.build_params(), { + self.assertEqual(self.remove.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'remove': "ch" @@ -44,7 +44,7 @@ def test_remove_multiple_channels(self): RemoveChannelFromChannelGroup.REMOVE_PATH % ( pnconf.subscribe_key, "gr")) - self.assertEqual(self.remove.build_params(), { + self.assertEqual(self.remove.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'remove': "ch1,ch2" diff --git a/tests/functional/test_revoke.py b/tests/functional/test_revoke.py index 6ed638d4..438ea6cd 100644 --- a/tests/functional/test_revoke.py +++ b/tests/functional/test_revoke.py @@ -9,14 +9,18 @@ from unittest.mock import MagicMock from pubnub.pubnub import PubNub -from tests.helper import pnconf_pam, sdk_name +from tests.helper import pnconf_pam_copy, sdk_name + +pnconf = pnconf_pam_copy() +# pnconf.secret_key = None class TestRevoke(unittest.TestCase): def setUp(self): + self.pubnub = MagicMock( spec=PubNub, - config=pnconf_pam, + config=pnconf, sdk_name=sdk_name, timestamp=MagicMock(return_value=123), uuid=None @@ -27,9 +31,9 @@ def setUp(self): def test_revoke_to_channel(self): self.revoke.channels('ch') - self.assertEquals(self.revoke.build_path(), Revoke.GRANT_PATH % pnconf_pam.subscribe_key) + self.assertEquals(self.revoke.build_path(), Revoke.GRANT_PATH % pnconf.subscribe_key) - self.assertEqual(self.revoke.build_params(), { + self.assertEqual(self.revoke.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'timestamp': '123', @@ -37,8 +41,8 @@ def test_revoke_to_channel(self): 'r': '0', 'w': '0', 'm': '0', - 'signature': utils.sign_sha256(pnconf_pam.secret_key, - pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + 'signature': utils.sign_sha256(pnconf.secret_key, + pnconf.subscribe_key + "\n" + pnconf.publish_key + "\n" + "grant\n" + utils.prepare_pam_arguments({ 'timestamp': 123, 'channel': 'ch', @@ -59,9 +63,9 @@ def revoke(): def test_grant_read_and_write_to_channel_group(self): self.revoke.channel_groups(['gr1', 'gr2']) - self.assertEquals(self.revoke.build_path(), Revoke.GRANT_PATH % pnconf_pam.subscribe_key) + self.assertEquals(self.revoke.build_path(), Revoke.GRANT_PATH % pnconf.subscribe_key) - self.assertEqual(self.revoke.build_params(), { + self.assertEqual(self.revoke.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'r': '0', @@ -69,8 +73,8 @@ def test_grant_read_and_write_to_channel_group(self): 'm': '0', 'timestamp': '123', 'channel-group': 'gr1,gr2', - 'signature': utils.sign_sha256(pnconf_pam.secret_key, - pnconf_pam.subscribe_key + "\n" + pnconf_pam.publish_key + "\n" + + 'signature': utils.sign_sha256(pnconf.secret_key, + pnconf.subscribe_key + "\n" + pnconf.publish_key + "\n" + "grant\n" + utils.prepare_pam_arguments({ 'r': '0', 'w': '0', diff --git a/tests/functional/test_set_state.py b/tests/functional/test_set_state.py index 1cf66c33..2761fc29 100644 --- a/tests/functional/test_set_state.py +++ b/tests/functional/test_set_state.py @@ -32,7 +32,7 @@ def test_set_state_single_channel(self): "ch", self.pubnub.uuid)) - params = self.set_state.build_params() + params = self.set_state.build_params_callback()({}) self.assertEqual(params['pnsdk'], sdk_name) self.assertEqual(params['uuid'], self.pubnub.uuid) self.assertEqual(json.loads(helper.url_decode(params['state'])), @@ -47,7 +47,7 @@ def test_set_state_single_group(self): ",", self.pubnub.uuid)) - params = self.set_state.build_params() + params = self.set_state.build_params_callback()({}) self.assertEqual(params['pnsdk'], sdk_name) self.assertEqual(params['uuid'], self.pubnub.uuid) self.assertEqual(params['channel-group'], 'gr') diff --git a/tests/functional/test_subscribe.py b/tests/functional/test_subscribe.py index 2f6bead8..3e0822b7 100644 --- a/tests/functional/test_subscribe.py +++ b/tests/functional/test_subscribe.py @@ -26,7 +26,7 @@ def test_pub_single_channel(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, 'ch')) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -39,7 +39,7 @@ def test_sub_multiple_channels_using_string(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -52,7 +52,7 @@ def test_sub_multiple_channels_using_list(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -65,7 +65,7 @@ def test_sub_multiple_channels_using_tuple(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, "ch1,ch2,ch3")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -78,7 +78,7 @@ def test_sub_single_group(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'channel-group': 'gr', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -92,7 +92,7 @@ def test_sub_multiple_groups_using_string(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'channel-group': 'gr1,gr2,gr3', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -106,7 +106,7 @@ def test_sub_multiple_groups_using_list(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, ",")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'channel-group': 'gr1,gr2,gr3', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid @@ -120,7 +120,7 @@ def test_sub_multiple(self): self.assertEquals(self.sub.build_path(), Subscribe.SUBSCRIBE_PATH % (pnconf.subscribe_key, "ch1,ch2")) - self.assertEqual(self.sub.build_params(), { + self.assertEqual(self.sub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'filter-expr': 'blah', diff --git a/tests/functional/test_where_now.py b/tests/functional/test_where_now.py index 6960ef68..7c5e88d0 100644 --- a/tests/functional/test_where_now.py +++ b/tests/functional/test_where_now.py @@ -26,7 +26,7 @@ def test_where_now(self): self.assertEquals(self.where_now.build_path(), WhereNow.WHERE_NOW_PATH % (pnconf.subscribe_key, "person_uuid")) - self.assertEqual(self.where_now.build_params(), { + self.assertEqual(self.where_now.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -35,7 +35,7 @@ def test_where_now_no_uuid(self): self.assertEquals(self.where_now.build_path(), WhereNow.WHERE_NOW_PATH % (pnconf.subscribe_key, self.pubnub.config.uuid)) - self.assertEqual(self.where_now.build_params(), { + self.assertEqual(self.where_now.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index 35158b73..c9ca2c7a 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -354,3 +354,26 @@ def test_multiple_channel_groups_with_auth(event_loop): assert env.result.groups[gr2].auth_keys[auth].manage_enabled is False pubnub.stop() + + +# @pytest.mark.asyncio +# def test_sign_non_pam_request(event_loop): +# pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) +# pubnub.config.uuid = "my_uuid" +# gr1 = "test-pam-asyncio-cg1" +# gr2 = "test-pam-asyncio-cg2" +# +# env = (yield from pubnub.grant()\ +# .channels('blah')\ +# .read(True)\ +# .write(True)\ +# .future()) +# +# env = (yield from pubnub.publish() +# .message('hi') +# .channel('blah') +# .future()) +# +# print(env.result) +# +# pubnub.stop() diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index e9a13292..312ab3d2 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -233,7 +233,7 @@ def test_error_invalid_key(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/not_permitted.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'signature', 'timestamp']) @pytest.mark.asyncio def test_not_permitted(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) diff --git a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml new file mode 100644 index 00000000..69106255 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml @@ -0,0 +1,20 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=my_uuid + response: + body: {string: '{"message":"Forbidden","payload":{"channels":["blah"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 14 Oct 2016 12:51:06 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} + status: {code: 403, message: Forbidden} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.0 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index e18cd083..1906b979 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -4,17 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0×tamp=1476628727 response: - body: {string: '{"message":"Forbidden","payload":{"channels":["asyncio-int-publish"]},"error":true,"service":"Access - Manager","status":403} - -'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Sat, - 08 Oct 2016 22:17:08 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} - status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=5b8bcd4c-23ea-4deb-913c-94a3e22a43ce + body: {string: '[1,"Sent","14766287276539619"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Sun, 16 Oct 2016 14:38:47 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index e8c987c5..e572bbc0 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.0] method: GET - uri: http://pubsub.pubnub.com/time/0 + uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 response: - body: {string: '[14709447239268595]'} + body: {string: '[14766398773102530]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 11 Aug 2016 19:45:23 GMT'} + charset="UTF-8", DATE: 'Sun, 16 Oct 2016 17:44:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0 + url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=1517d268-4797-4fcb-941c-0f862e61399f version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index 43314261..fbc8fcea 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -12,41 +12,41 @@ interactions: '} headers: + - !!python/tuple + - Server + - [nginx] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - X-Blocks-Enabled + - ['0'] + - !!python/tuple + - Cache-Control + - ['no-cache, no-store, must-revalidate'] - !!python/tuple - Access-Control-Allow-Methods - [GET] - !!python/tuple - Date - - ['Sat, 08 Oct 2016 22:27:54 GMT'] + - ['Sun, 16 Oct 2016 17:25:46 GMT'] - !!python/tuple - Content-Type - [text/javascript; charset=UTF-8] - - !!python/tuple - - Server - - [nginx] - - !!python/tuple - - X-Consumed-Content-Encoding - - [gzip] - !!python/tuple - Access-Control-Allow-Headers - ['Origin, X-Requested-With, Content-Type, Accept'] - !!python/tuple - - X-Blocks-Enabled - - ['0'] + - X-Consumed-Content-Encoding + - [gzip] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Transfer-Encoding - [chunked] - - !!python/tuple - - Cache-Control - - ['no-cache, no-store, must-revalidate'] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=f6efd00c-f770-414d-a628-67055d80dc33 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.0 - request: body: null headers: @@ -60,39 +60,39 @@ interactions: '} headers: + - !!python/tuple + - Server + - [nginx] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - X-Blocks-Enabled + - ['0'] + - !!python/tuple + - Cache-Control + - ['no-cache, no-store, must-revalidate'] - !!python/tuple - Access-Control-Allow-Methods - [GET] - !!python/tuple - Date - - ['Sat, 08 Oct 2016 22:27:54 GMT'] + - ['Sun, 16 Oct 2016 17:25:46 GMT'] - !!python/tuple - Content-Type - [text/javascript; charset=UTF-8] - - !!python/tuple - - Server - - [nginx] - - !!python/tuple - - X-Consumed-Content-Encoding - - [gzip] - !!python/tuple - Access-Control-Allow-Headers - ['Origin, X-Requested-With, Content-Type, Accept'] - !!python/tuple - - X-Blocks-Enabled - - ['0'] + - X-Consumed-Content-Encoding + - [gzip] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Transfer-Encoding - [chunked] - - !!python/tuple - - Cache-Control - - ['no-cache, no-store, must-revalidate'] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=f6efd00c-f770-414d-a628-67055d80dc33 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.0 version: 1 diff --git a/tests/integrational/native_threads/test_publish.py b/tests/integrational/native_threads/test_publish.py index 02cf42b9..7cab5162 100644 --- a/tests/integrational/native_threads/test_publish.py +++ b/tests/integrational/native_threads/test_publish.py @@ -187,7 +187,10 @@ def method(): assert "not JSON serializable" in str(self.status.error_data.exception) def test_not_permitted(self): - PubNub(pnconf_pam_copy()).publish() \ + pnconf = pnconf_pam_copy() + pnconf.secret_key = None + + PubNub(pnconf).publish() \ .channel("not_permitted_channel") \ .message("correct message") \ .async(self.callback) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 955054e2..77c6f3f5 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -218,7 +218,9 @@ def test_error_invalid_key(self): 'tests/integrational/fixtures/tornado/publish/not_permitted.yaml', filter_query_parameters=['uuid', 'seqn']) def test_error_not_permitted_403(self): - self.pubnub = PubNubTornado(pnconf_pam_copy(), custom_ioloop=self.io_loop) + my_pnconf = pnconf_pam_copy() + my_pnconf.secret_key = None + self.pubnub = PubNubTornado(my_pnconf, custom_ioloop=self.io_loop) self.assert_server_side_error( self.pubnub.publish().channel("not_permitted_channel").message("hey"), "HTTP Client Error (403)") From c426acf28640c4cfa856b528fc266a26bc490d4d Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 17 Oct 2016 01:51:58 -0700 Subject: [PATCH 369/468] Remove unused imports --- pubnub/endpoints/access/audit.py | 2 -- pubnub/endpoints/access/grant.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/pubnub/endpoints/access/audit.py b/pubnub/endpoints/access/audit.py index c2d4eb80..935958b0 100644 --- a/pubnub/endpoints/access/audit.py +++ b/pubnub/endpoints/access/audit.py @@ -1,5 +1,3 @@ -import copy - from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.enums import HttpMethod, PNOperationType diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index fba2e6d1..57a2c600 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -1,5 +1,3 @@ -import copy - from pubnub import utils from pubnub.endpoints.endpoint import Endpoint from pubnub.errors import PNERR_PAM_NO_FLAGS From c15a30324a8e40754343349202b9e8ff1a5ae472 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 17 Oct 2016 01:53:27 -0700 Subject: [PATCH 370/468] Remove publish_sequence_next() abstract method --- pubnub/pubnub_core.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 3a94b29c..3a779452 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -59,10 +59,6 @@ def base_origin(self): def sdk_name(self): return "%s%s/%s" % (PubNubCore.SDK_NAME, self.sdk_platform(), PubNubCore.SDK_VERSION) - @abstractmethod - def publish_sequence_next(self): - pass - @abstractmethod def sdk_platform(self): pass From 95a500f02553988a5e33344627e3a4427f563380 Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Thu, 20 Oct 2016 16:05:49 +0200 Subject: [PATCH 371/468] Finished twisted tests, without subscribe --- tests/integrational/twisted/__init__.py | 0 tests/integrational/twisted/test_cg.py | 0 tests/integrational/twisted/test_here_now.py | 0 tests/integrational/twisted/test_publish.py | 0 tests/integrational/twisted/test_state.py | 0 tests/integrational/twisted/test_where_now.py | 0 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tests/integrational/twisted/__init__.py create mode 100644 tests/integrational/twisted/test_cg.py create mode 100644 tests/integrational/twisted/test_here_now.py create mode 100644 tests/integrational/twisted/test_publish.py create mode 100644 tests/integrational/twisted/test_state.py create mode 100644 tests/integrational/twisted/test_where_now.py diff --git a/tests/integrational/twisted/__init__.py b/tests/integrational/twisted/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/twisted/test_cg.py b/tests/integrational/twisted/test_cg.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/twisted/test_state.py b/tests/integrational/twisted/test_state.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/integrational/twisted/test_where_now.py b/tests/integrational/twisted/test_where_now.py new file mode 100644 index 00000000..e69de29b From ac89000b0654fb77ef061a606a9378fc6b685075 Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Thu, 20 Oct 2016 16:07:12 +0200 Subject: [PATCH 372/468] Finished twisted tests, without subscribe --- pubnub/managers.py | 2 - pubnub/pubnub_twisted.py | 14 +- requirements-dev.txt | 1 + requirements-pypy-dev.txt | 2 +- requirements26-dev.txt | 2 +- requirements27-dev.txt | 2 +- requirements33-dev.txt | 2 +- requirements34-dev.txt | 2 +- requirements35-dev.txt | 2 +- requirements36-dev.txt | 2 +- tests/fixtures/wild/domain_redirect.yaml | 210 ++++++++++++++++++ .../fixtures/twisted/groups/add_channels.yaml | 16 ++ .../twisted/groups/add_single_channel.yaml | 16 ++ .../twisted/groups/list_channels.yaml | 16 ++ .../twisted/groups/remove_channels.yaml | 16 ++ .../twisted/groups/remove_single_channel.yaml | 16 ++ .../fixtures/twisted/here_now/global.yaml | 18 ++ .../fixtures/twisted/here_now/multiple.yaml | 17 ++ .../fixtures/twisted/here_now/single.yaml | 16 ++ .../twisted/publish/do_not_store.yaml | 15 ++ .../fixtures/twisted/publish/forbidden.yaml | 18 ++ .../fixtures/twisted/publish/invalid_key.yaml | 15 ++ .../fixtures/twisted/publish/meta_object.yaml | 15 ++ .../publish/mixed_encrypted_via_get.yaml | 54 +++++ .../twisted/publish/mixed_via_get.yaml | 54 +++++ .../twisted/publish/object_via_get.yaml | 15 ++ .../twisted/state/multiple_channels.yaml | 16 ++ .../twisted/state/single_channel.yaml | 16 ++ .../fixtures/twisted/where_now/multiple.yaml | 16 ++ .../fixtures/twisted/where_now/single.yaml | 16 ++ tests/integrational/twisted/test_cg.py | 101 +++++++++ tests/integrational/twisted/test_here_now.py | 84 +++++++ tests/integrational/twisted/test_publish.py | 183 +++++++++++++++ tests/integrational/twisted/test_state.py | 55 +++++ tests/integrational/twisted/test_where_now.py | 49 ++++ 35 files changed, 1080 insertions(+), 14 deletions(-) create mode 100644 tests/fixtures/wild/domain_redirect.yaml create mode 100644 tests/integrational/fixtures/twisted/groups/add_channels.yaml create mode 100644 tests/integrational/fixtures/twisted/groups/add_single_channel.yaml create mode 100644 tests/integrational/fixtures/twisted/groups/list_channels.yaml create mode 100644 tests/integrational/fixtures/twisted/groups/remove_channels.yaml create mode 100644 tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml create mode 100644 tests/integrational/fixtures/twisted/here_now/global.yaml create mode 100644 tests/integrational/fixtures/twisted/here_now/multiple.yaml create mode 100644 tests/integrational/fixtures/twisted/here_now/single.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/do_not_store.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/forbidden.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/invalid_key.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/meta_object.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml create mode 100644 tests/integrational/fixtures/twisted/publish/object_via_get.yaml create mode 100644 tests/integrational/fixtures/twisted/state/multiple_channels.yaml create mode 100644 tests/integrational/fixtures/twisted/state/single_channel.yaml create mode 100644 tests/integrational/fixtures/twisted/where_now/multiple.yaml create mode 100644 tests/integrational/fixtures/twisted/where_now/single.yaml diff --git a/pubnub/managers.py b/pubnub/managers.py index e1a3ef5a..d45cbd31 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -181,8 +181,6 @@ def __init__(self, pubnub_instance): self._subscribe_request_task = None self._heartbeat_call = None - self._start_worker() - @abstractmethod def _start_worker(self): pass diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index bd3aa4e2..85907eb6 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -19,8 +19,7 @@ from .workers import SubscribeMessageWorker from .pubnub_core import PubNubCore from .managers import SubscriptionManager, PublishSequenceManager - -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType from .errors import PNERR_CLIENT_ERROR, PNERR_CONNECTION_ERROR, \ PNERR_SERVER_ERROR, PNERR_JSON_DECODING_FAILED from .exceptions import PubNubException @@ -205,6 +204,7 @@ def __init__(self, config, pool=None, reactor=None): } def start(self): + self._subscription_manager._start_worker() self.reactor.run() def stop(self): @@ -233,7 +233,7 @@ def options_func(): request = self.request_deferred(options_func, cancellation_event) request.addCallbacks(callback, manage_failures) - self.reactor.callInThread(async_request, endpoint_call_options, cancellation_event, callback) + self.reactor.callLater(0, async_request, endpoint_call_options, cancellation_event, callback) return @@ -244,6 +244,9 @@ def request_deferred(self, options_func, cancellation_event): pnconn_pool = self.pnconn_pool headers = self.headers + if options.operation_type is PNOperationType.PNPublishOperation: + options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + create_response = options.create_response create_status_response = options.create_status @@ -251,6 +254,7 @@ def request_deferred(self, options_func, cancellation_event): options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, url, options.data)) + print("%s %s %s" % (options.method_string, url, options.data)) def handler(): agent = Agent(reactor, pool=pnconn_pool) @@ -264,7 +268,7 @@ def handler(): options.method_string, url, Headers(headers), - FileBodyProducer(StringIO(body))) + body) def received(response): finished = Deferred() @@ -363,10 +367,10 @@ def failed(failure): pn_error=PNERR_CONNECTION_ERROR, status_code=0 ))) - request.addErrback(failed) request.addCallback(received) request.addCallback(success, url, request) + return request return handler() diff --git a/requirements-dev.txt b/requirements-dev.txt index 95455bbb..e7332b1a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,3 +3,4 @@ pytest-cov codecov pycrypto pytest-benchmark +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt index f9ff90dd..e23b8c80 100644 --- a/requirements-pypy-dev.txt +++ b/requirements-pypy-dev.txt @@ -1,3 +1,3 @@ tornado flake8 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-pypy.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements26-dev.txt b/requirements26-dev.txt index e824a660..6679e830 100644 --- a/requirements26-dev.txt +++ b/requirements26-dev.txt @@ -1,2 +1,2 @@ mock==2.0.0 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py2.6.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements27-dev.txt b/requirements27-dev.txt index 8e5d1e41..416c62aa 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,4 +1,4 @@ tornado pyopenssl flake8 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py2.7.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements33-dev.txt b/requirements33-dev.txt index 628fe7f4..e23b8c80 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,3 +1,3 @@ tornado flake8 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.3.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements34-dev.txt b/requirements34-dev.txt index d2bdb8ca..8730cb89 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -2,4 +2,4 @@ pytest-asyncio tornado aiohttp flake8 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.4.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements35-dev.txt b/requirements35-dev.txt index ab43cbd2..8730cb89 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -2,4 +2,4 @@ pytest-asyncio tornado aiohttp flake8 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.5.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements36-dev.txt b/requirements36-dev.txt index ab43cbd2..8730cb89 100644 --- a/requirements36-dev.txt +++ b/requirements36-dev.txt @@ -2,4 +2,4 @@ pytest-asyncio tornado aiohttp flake8 --e git://github.com/anovikov1984/vcrpy.git@pubnub-hacks#egg=vcrpy-1.10.0-py3.5.egg +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/tests/fixtures/wild/domain_redirect.yaml b/tests/fixtures/wild/domain_redirect.yaml new file mode 100644 index 00000000..e72a51a3 --- /dev/null +++ b/tests/fixtures/wild/domain_redirect.yaml @@ -0,0 +1,210 @@ +interactions: +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [vcrpy-test] + method: GET + uri: http://seomoz.org/ + response: + body: {string: !!python/unicode ''} + headers: + connection: [Keep-Alive] + content-length: ['0'] + location: ['https://moz.com/'] + server: [BigIP] + set-cookie: ['visid_incap_157525=R/YNzv8NT3iSCATJ5aSyYsDBAFgAAAAAQUIPAAAAAAA4woOieqT1uc4Mav7tDwqX; + expires=Sat, 14 Oct 2017 08:29:36 GMT; path=/; Domain=.seomoz.org', incap_ses_163_157525=+X45MiBU9S4P/Q5jAhhDAsDBAFgAAAAAolJy4rjGd1/X5X1Hm9JecQ==; + path=/; Domain=.seomoz.org] + x-cdn: [Incapsula] + x-iinfo: [8-15965355-15965356 NNNN CT(38 -1 0) RT(1476444608757 1) q(0 0 0 0) + r(1 1) U11] + status: {code: 301, message: Moved Permanently} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [vcrpy-test] + method: GET + uri: https://moz.com/ + response: + body: + string: !!binary | + H4sIAAAAAAAAA+1963bcNrLufz0FpmdW5OwR2bw22bIkj6w4o8zYcRI7zs7KydJik+huWmyyTbJb + l4zX2q9xXu88yfmqQLLJvkiyrfzbtkWBQAEoFOoGoEAf/eWb12dvf/3hhZiWs+Rk7+gvmvZbPBZJ + Kb57IYa/n4gjKhBhEhTFcS9Lolj2kPmX32QaxePfNW1VZ8J1TOP3E8qpayZBOjnuyVT7+Q1X1LRu + 5akMopM9IY7KuEzkyavs9lC8efFavMnG5VWQywPxNsuSQgRpJH6SRbbIQ1mIcZaL57IsZS5eBfml + LON0ctRXTewdJXF6KXKZHPeCBCBpUMqeKG/mEhnzeRKHQRlnaT8vir9fzxIUUb3j3k9v3ghLN3pi + msvxcW9alvPDfn8sZTTPZVHoM9mfZbejJJv0RB/dzGQZiDSYoeoyllfzLC97IszSUqblce8qjsrp + cSSXcSg1fjkQcRqXcZBoRRigQ5Oawchb7USyCPN4Tui1mnoehJcyEqMbNBAtijK/0RKQDWMWUYC6 + RJtyKkHrfCKLEhVnswW6uhHZmIhZiCxlgDlmQ5YHAlQWo0WcRIUombrlNCjFLLiU6GGULdDerCar + kEFxo4s3ZZCX4gb0F+NcSlHmGAhqR8HNX5gcNIcrwodBmqUgdNKmZgFygoI68FNV9tpzVUxBwHBR + ijik0XerRaE/jdJidhvMlzM9TLJFNM5BHx3j6Y+DJdXR8eh1pr8obxJZTKUsP6k98Losi76qTRj3 + Mf/zLC3ipdTDong2lrYjA69mqlJel33k98RFGKV4zxeSB9ghCbGe1MpsEU41QlcDV4ES86yQUU8U + 8a2EhLnetet9DrLxLMDc16QgpLUqrbmePk8nzzzbcQPX/UzEPOvasx4ZMc9ixALXHw5HwWciZprO + NX4eGTW0yLj5o0gOA+NzcXOAm/PouDkKt6HhyoEX1aLU1SR5NsrKoqVE0iyL5rWk0h8FHU6DHB0e + 9xblWPOrca6KCWVNfljEy+Pef2s/n2pnGCPU5yiRrba/e3Eso4k8CKd5NqsU285mzlQt7S1kp9UG + CxGZjKcNTttRUuMrr2JS/4dFXLZb+QdU20aNeZ7NZV7erGoFYQgtV17EUauu6Q5c0zOMO+qPR4dz + zEu3nu/4Q8seWI57d80gmsVpe0pMA38cxzfcoe8M76q9lHk8vtGWZntCLTPJ4uU/z93+r7+eTkbT + y/+Of5xNZf+Xq+uF178d3/5wPvn27Yf3iXF8R9OTLJuAk4mOGndTmcdWT+OL6TvHSa9+CMtvPvxq + T+c3qWt9Gy1gmaN/jy8X8b/OXd//8cezNz/f0dGsWAZJDIMldaM9jsHpwDdO7YHtDp1vvzlznlvD + bwzTObNcwx3YZ99UTXbsLcRJ5rnMW80s0iIYS22RJz0Shw1PhuRDGVdR5OFKGKGx3xeVEMKASrJO + /eB9cN1P4lHBHOkW03jZt3VPt1bvOiZTf1/0To76qlnyhFqezd4uQ7RuM9Z0g5WVt+F44S0/3F4V + 68phkmSjIEmDZd/ULWBTmagmm5GiVoFMX7lWe0ejLLqpPbgp5FPQQ4MrIa/FbJIihXkv4WCsrJyW + BDD1pVC/tEu4K3GUFSHmsseUjOKliCN4OXkApVI1nmZahqbGSXbVU1zA7h2cNAJtkGzgqfNZEKdi + 1SYPCH5QXMBXuTmEE4EOj4rlRMBTS4vGK7u6utKvbD3LJ30LQtQHBMHdzEZZIsgbe55dH/cMYQjT + x78eY8CDJQ06yrJLgCt/scmpHUhxBA03FajwyhzoliuMc9MKNVDcFoZm6TZyB4aj2cLUXcs+86sc + W3gMIgZUQ/fcM93zURt/qwRlvjOdEBnDgcuZlLV6nA9CdOMA1KKOTUiKStFjiu5CQ2MAKtGaEk5N + HTxCarjqSWs60FTHhBLIobKBq8mQaoi3rwbCpBYY81DTTRvD0KhxHcZQJSzVCJCg4jq/KroT96WJ + Mg/NDmxNdzwPGDkGkkjxAJC4JWqjHpMHzXO/VduMF+ZA9x1PEAkGqDW0uS6qvrMVVveQhockqIpq + mcfj3PbghUOImXe28xBatZw1HoJkFrLLRJy1jYts3TGFab2kdizdHdZPIGuJqpQeinpcZhr8tHgu + 63KD4Y1VC4waFX3uIDKS/UIp/O5YWiWrIYVxHiZShGhyoBusxqHZ4bDmsGZAoQ0wvA/AtLZBtOiG + MZqe8M5NH2w3NHmCDRc851uORjl4+LbHyXNOnlGRkjjfHTDthuYSFDP9M4MoTb6TT9xJZPNt6Abn + 3F66iQtUXM2d4peTaOAg/FvauuGfkfpANeEDXJhDMQQP4ve5OUhc4S41EkvTC5ndDW4U+A1Ugnp/ + 5+NxBqw8yraAgi88UQ3t9pWH3wPiDcKJ0u9M69x6Z01NB3ifU7F/C0pAYKeavUQ1/yXkhHABYYyl + Zk8hiAOXEbArDDyNh7+izrvhuWUt/QdwiYlqgzUuiWRSBl324KwWq2fJzQSLzHkWpyU5vrbu+oMD + zLBlDIR/APUIzWiBUZ060zzAtHhDC6WQ3iFo6lY5n8fKEvyasH1q41nnbpFK0BSUBscMMR2stShl + CNB9EBIdTcOuCvF3ahkhZxGkpvI1653DTGmSKkOWZtFfqFKMEDMG+vt24ugeunJIX4V4QO96+sD3 + oP9YV3kDShVQyqRUXZWlUZ6qqXHNlxamERQ0ziE0HkpM29LAlyZYiHgDhfZSA296CdQJmgGfWail + ipzbGenWgasNdM/xXgIfXzcGzOkYEaqhiOpZDOAwwzlgNs+0E7TqDl1U8CwbGthCi+YQWtkdWirh + g/HRE2qaIAgI9ZnKCB4RbdYkazNY5W6fQQiBB2FxEyL8uXfmVpPoCk7ABiztepLJ2tXl3tJ0t0yy + 6W6ZZJIxe3s+d7t0b2cadAHE1pvakNptDRtLGwYOKCyBLQlHonk0sUI9SYcrTe7Q7JBJcN4Np9a7 + hxBzm4szzRbr5omztpknl90Pf6oBsaVGit2dwm7COKo8qDBnaEHDWhbbYJtNsDFkU05azhxA4wyI + bQ1yOyyDnAbws+cAgKyy7730dOJ0MsMDDzR0Bz7pJ8NXSagGXxgJOVADcJJpOIBzfN11wLcOCwqQ + 8AS3xd2gF/Rv2x53TDj4lJoSZha0qI9JISvhTmkkA304hKJ2nJdDyJ9FnpvnsJeDH0LCIXw5hS6J + n3Xb8ARVOyfnYgkhMKklRZ8BzeE7kqnP5PWZTBfd2aGcbTzuCJscIhckdTBLGlyBcxOYuy7NAmXi + aRb8m4qnmCMuFKbgGsK8fcWexqM0Y5lf3MznUWwu0zBe0w0qbxvVbN0eYvawMA+RAp/44A7gNwSz + D8hvcBziYvA1cSoYdwhGhTdvMbdaL03oRIC6hn2GpGkSV5Mu9eF9kIn0wP7QgGATi0bloj2XEceA + l5p5ziaNFLjjU4vuS8bIYpSIMfHLpqfnk772SOAhFZACtpI2KWOPH+qVHhbpDx3iAffVtdrVTAyP + rD0GuapocYbHhfAgIInUGAys6yeEkslDJUM9JB8Z8ma4PkkZ+cbgbNOHiNkWuen4cUEgm1Y9JDmG + RSkYGFe50+QvebrtkWCS7wHDRwbOYBG3fQcSTthgCgyP/mEYpkWiTqRPqHcsJlxgOWOLQ7Pjk3A6 + fvVDg7DJFVIuFcyWZ3j08In1oGXwQ7WA7sBVriGAaaqG6sdik+pC71h482wv8Wkq6TEQLUpSBnl6 + Dq2AwAc0MjJ1DisHi6tSG5+plOd5Fi3Csljj4ip3q5vtKP/YYf/YXvegN0q31TXbxSut76mlFubK + ZS4B64HvhF1otnrVbF7ickoViQpM2OBhgiIy+ZbP9sBlxW7SEk53C3oR1Uv9o9WZWv2i1S/mgzTp + NpoWMsjDaZeiKm+bqfNpvQvJJLPm2vx0zngF5gleJtAqGBww4N8evDtY8YFGCwfNo79vDHKtaI3h + FZzw6C+8gwEtN4ijiV/ARQ4JJY3LtV9ynwp71T/8fihkIh/WGDa8T8KEpByGlFL4eWNjKe8z6Tym + KPIEQwhK1fC+qODp9wNICOPdVq20r5xkk6yhX52xhXgelPfgpW/BJgobDgKkmIUUMuLTmgfmnXwj + yLlFrqM9OHMdfUAuEJ4D4Qx15V9DXIlUqMfrcRJaE5TDMsg2SfgG9js0T/SjTRcDeoeEEELtwmmG + mwx44iLT8xKNPBMfDqwNFesJWkB5ZwMwKcszUcqxSLbRAE8IOPfcWJrDKW0BeCG5NRBxy6FOMRSL + HHYyEliEJUNiWqy1X9Jy0YIDYAxDVnQYiAMV5vuYSVKM0PYmuQVo40wNBmqW7LYaIVI8ZKhY+EA2 + r+gdzJjt2ZSgJT4N0yYVQ7shBqjogOXOB8OXLq0Up0RpcohIC4HWsBqWxnrZH0Kt+b4DT+TcMyGT + 1oC0HK16B8Ra3gCMSpiZTLWBX6WBNG3u2Ox6gjosCUNyvJpSquzTXhbk2xJcuUpTcaFxLU5rq+w1 + /qNdOTyjeNns77V2/kZBXu8SrpXQnm4Qp7Iu34RQLFsVojjYccq4AqHd3+Wks/PYsH4LCGBwksU1 + bd0eqjb/uhNYDXCFRT9o8FWDPkqDDtp41WgXW+13LpJq+EncBopLORN1ojEOYkWLHYPtr6zLD41F + qTA66ifxAzqjs+0HdMRH4CfP8fzUDoIR7Srf3wPD9U5O6ddGH0d9otxRH9Q86c5csk5sLB7zoM0o + XeRq29Ge053U5fM4VeMil8Ui4eO17kibWII3my1vciDZKrFhyDpVdvHj7hprTNlhy/Y8bSEHOpHE + AyFtjt8JiI4V5oVMZFgGdBz4ICpyTVAx2026l9z4V+IsS1O0/Uk0VBv7D6fgFvgN+lGf8yBtdzqN + IzoiySdSi7KrtHdS4RzM5k9rvNEOan3pRIit3d1ZGWpAVL+V5mBlmyzk2oSJB/J91QwlmjmiABIo + md5JlfiEoWVhkGziV8oq95Px4wb7dO5Efk4Hw5dUpHDk5MOxVFExa/i0ke41x+j3oMctNVh9S6Ez + HNDUO1mlt+DVHvk6ASdxus6zwVaVO1qUZVbX2Ek+bu4lFH+cdhDpkkgp3Sq9zaxlo7ijBNZNNsv4 + Xfa4K8lqg+QBlnk79IZprpwQ9UKWY6+Tv9NLifLgSuZilWwpvyguiDEiOm2904XZcF+oCW0sg3KR + c/VtBKuKNTq+vd9irhQr/P4yz9LJmkK5rLXUmxevQR0GOWlN+PM8CyKZqhAvisC7iuH3r8LA8k7w + XZAkoriM8UzkUibFYdXKiOLP5nkQljFAD5qANVEs8qW8EZXhPBBXchSnQV58lY6K+dMgjVRiluVS + r8c6yk+2JOftgU1yNMpyygOCyxAtgzSUahgr7BnX4vCoP38gJVmtaE0DvS3UZE3WCj8MTjYtRSHn + QR6UGfjgP12LcE//VVzDnRhUkTSP1vNIQheAZwttsiCTU2ZakYUUsDiTURxsweANF4tXVNzy0+4T + KsX/3Emxg/s3JvafshQFBSHKiFnzsCXTnzSiNd9DDeTtVIrnFfB+If5J0KLMlLAE9/TS4pgdTSte + YfkjbjzDrMn8/oa3oP8Qvtg1mIpflKR1GLczWV03Ws0VhZRW6rlSgwUabS3hWpZi12iasNT+h7ad + 2KWtfmR36rTRVU0N4oQgLYAEdFGezTi0lYz8Wd1Bo+i3rU7uxXMqk/lDEDwHnDhfjDYxVIp2ml0R + 1clqVW4Suw5fhlxDxIdg2BCkck1fLDH9xSa+lcuqVL5rGP8WWUo+aKVAQegvQ1otGO/Hl5aUW9D7 + SQZRM8kEwxHPv2YLvO9CrF4kdlWRCoqSOYVF1VFbyyAXF8BBHIs/uAmZLg9Fr/L0KDDigLOnWVEW + hxVME8wEyM8K3aoanVG8+8a2RVUWtIqCNEhuYFQLvQuUFXKzAYpX5rUhe599wPQr8PHV/eCAqcHz + AM7WffAEpGGdHV7C3VH1Lq+ie6tdypurLI/gRY3HcQiv4KYeUkpr7ftHBW8ccLAUNKNV3RDKKbm3 + KkNhzVGUVbVgHm+p1Cx9UNzQbwvcOEuSDOroKgMTKzg2BltAlZFQMB+CLQBtJVkNSWntrbBc0u8B + 7iMBk9u1lIpHP1ZMJMuA2dTc2/v4dO/JeJEyUz/5mqGI+a/A+Vdw1LKrp1VOjJw1QFXAUhJl4QIO + d6mHOVxU+SKR9PZkXwnU/tdPlYSkOkU6An6fYx3fB8uggmgAguImDQFBAfNNZpFT1v5nBkRyD+sR + ke+Lqk8aQ9EewkSWFf7F85u3weT7YCZXI/nN+F3VK3Q4UwD6PoukHqeFzMvnEn6wfDJJD0TBQ/5I + j3gsnlzpf6tpFj9RRQIusmzR8SohmuvQsnC6VRf12zbSC6rw1Vd4Pqmo2zRd9ftx7+PXlLEKRmVl + WGu7rn81yq7h2CVxJEjJBznkiKKiq12CIIlpAcMuyhbnrFnZwLbN3a07tJM8jnasBMMMzkWWVM3D + lVPbGiXshtQ+LMi9y4vuSm5q1pUZlro1xCjD0nZmrLY6ydL+QEJIS4Vfyfl/rUzYu7iIsTSFROnQ + /ma3aaduOkjKqk27d/K6bfzIX4sLulOjbg7JSGc7VFQXlPjaTCHiUl2UQR9Op4/5iurU/GBz6a5s + 5mr7tjNcLSwDSGekEtWKfp7HQO5G3MiEY23fyK6LsbGOn7dmo7sUXvnQd3rtWD7IpHY+RTHD+o9U + floouRAjaP9JTjeHNGjyPIBBn0xL0s03GyvgFQepTQM0myTBHAJCnBEr4m/jwu50ER/0Tmz3wDCM + v4sQy8xsRi5h5W8dKDc3TsNkQVelDlczs86r4j0qU3y96q5pi3f8i839xHg26caQf8KFDoq97g+H + WPhgfIVeLCfPotD2DbpjglEd95qy9dtEj41ERjIPVcA4OL45GDhRhcPrqujPRiEPbrN8HBdTRQd3 + bI8GboVDU/ZnIxEEKC0qKvihEzkVBqdc8Kd3H0U2dz4y3OEolHXnyP7TOaDSi9T7OLClSZGfigFU + yW4ENh1r+tV2rzmw/z6JV7qhkGzu2tCkU7bBbhHeUcBL5K2WiMwN7V0sZlqWSm0aJOMdhombogdd + ginp5mKl5caJvNZk2jZonYp5dqUVEgsrrbySyRKmoK26xMrWtlQknUppEcyLsrhKh/bqyw8tQJ6t + Q7HIkyf722bw8kpqM+j8RNIkwvVq95LLOfyzQ5FmVbJTOs+KmKh+2NKxR1O7o2Hht2nX1yt1TtjS + /iJtNdXIwoWHplTGDV7m/BrOVcm3SSaj4InlDg7E6mHoNnCcg+dJIwvTmF8/7Z38W60ExIvreQKf + Kq+2q8BN9iZWvROAAXeYZVoSVnVh8mD3eV34SpY51kniNYphDt7CTsI3OIcJ1ZsW52sbL51TjmZl + Iit8GotcmV/wa5ZGZID52KKxzgEWMtf1rruiSA+rmRB+w+Vx72ISfNDni2L65Lf9C14u8XJ8/wC+ + Lubygi/k0JtqgFJw9C8wxRdqivd//xrEUhdxFamICN9nV80OzrwWxJ2cOqbLPTWjfoFR7zI5y4jK + mcVRVJ0DHE2tuuuuz9ackE2t9mz8Ir/6qz18Cpdq1Fx43nmtWTn4G/sU3ZvO4itMUzF9Snsa5CYw + f/DNP1BOF//KoKJiVaF930HQBndxSRvd1fZ0RLe49b3GlVr36jCoFS+ttmi+aPKbZi7eA081+TXG + 5N82mzs0/Ztzv8vP+3MUJO/MVhnkxeWSqCnvUpqPwYrKAf4iZuS9uh2suJSimFP3dLwoAhHJEOat + ZpkSmIVTIA92VLsLzF/TANUCkWTkoopiSncKxbe0Txmn4KhZQGv0Zn+W+6n2aHkRA9eVD0YoHYSh + LFjV0YRfptlVQvdsQY1CHhAOuazqp5kYqe8hgPNDyWc0lWwQTm9evFacLKHlmMe3MrNyqVec3Dqt + /xJORgMXikCVCnvxutqQfFMF6gUnCj317JxlsBFqrybq04xOjTWUN05vvgR9bqwzALWdv0L+IZq3 + 6yNsdQsqQWTHgC3LJ/O1VfO1gM1kyl1N45JWU2WjdmV0KJojceaOf/IVYPHqRjxfgNvAckoe9u7Z + 0u3PbmDtVA2SXQxIavR1CD4/r/21L3ZTscDGHIIHCppLzGqKMtqy0ZikWHbHMmcnNjRsT4Zh5cR+ + wngb32sWXKuPdRwKy2LvpEVdu9ki2PCL2QRvkaV7znfuJ+JO10NNbO17PAaHx2lBYlZcoD3F52+h + XuFPgXy53HQyatX+gB2FysM/qXfdt3yNJYn+/r6gW4h7tOfV+wfbguuyV+17gmoFlO0soDu/vDPa + +wc1QuWv80mQxrdBs1nfo1viPYEi+hwA59C9cLFjq73HkX1i1VNkSRnPwzyElA3WOXQEsxSpA7k+ + bxBQWxfkGtNXGVSDcHBzZqv6vGCF7A8ZbGVyWgGoTdoa/oxck/yGwH6GZYcLBG+vlOtgzMnkXwAO + SqgsoQu6ED/BuoAWKP/ltC6ac8dnWcRoDH3TMOuiAqZMljVOKDVNOEsWROUUpuqv8J6aLebemFQV + fGJA/UTC9C2W6JBPNW7MT6zoTIkyO6SztH90aF1gak6ZMr+pzusZmSeLQldfI2Dh+DvMxKyavhYY + 3fwew8RR6BbDbYGpPvOwqxiMXgYwJrMa4GL6YVs3dPd9MVLYLAqZ98FN5z9ug6TjKyjvtN7Ch326 + 4Z4B+jsPe56RZxNj5tWZ0iZjKHNy2j5y6pXk+jYycF844rMPx39UORj97GPdyoeFzG+0OJ0vuKmc + PsRBe6/8LYVWhZ7aSG5tIh/1aRnfWnjXd/61cZbxqnF9I4BSqqx16b8C7kS3KJg6jmoj+IWLtQKc + ld5sXdqvR9lsdVq3xArvVsf3RBruiBcW/xsh/78R8p8UId/lsnvCdWuhqt7XYjOgdtZOS9pBjXcx + uwqx5iPEIFTOISXuiACsmt+Ig+XF2q5TjU+IUf+Te+RD3JPTH767v8MHtkwqs6CzmGUQ3pCzhNdq + XfODyny0rtRkvc9GBe0BjB5AtAc2rGJdKJLlziZVNMVOFRtm85ucfMfOpJzVuZB2cyC+IqinfDQj + vktDXYhTeJcMUFBcoMyXMtJ3sP6mW1l71ptGg1ZUFCoFD1wLcqy96tjXv64MyZ2xp9X3DlpStx54 + ugWsJcj1YuB+/FqY0Uf+aM3/NlNTsRFSWtUeB+XWmNL1SzPr5XnzUZ571cga+1ThOrxsr+KV1yN0 + NoKpH2Jv79l0bbaFf5JFs9L+wh43wj94UKeLKC7r6H0qe4SetkTg8BTzN6EefUSdEJwT+OWX4i29 + rcL7Hm2eCpnxypRj/2qWwMvOfjq64/M4byPU9nH4T10dqG/R1HsB4qXaaCgUXzwC/VQ/vGCfB3OZ + gwPjklerWpjIIF1ABZ9VOeJM5TxWt9UlIY04hHZPsHQqMzotUzT9SWWLb1X2ow2Wt6xgGmkLWPX0 + bZaLF03un8ktDZ+sPhj7WByjAhnrMMRHoNaOAOWTenv4//3P/60DeN92o5E/v89OHO4qRLSJt/1y + nZTDENG268kvWX5ZTLN57Re9rUoeQ8EGadTnb27OZBrJiPcHiXi8iYblcJBCY0EZrkD4WgN/wDKN + 5W5eX1112X7KDdPcV8a4gtrxWUE9m5fxLL6VyQ1j/L7ou75lWoZvmGtfDtzRyIO+UltFvNHyNEsi + NPzMtMcjR7qdXcpWZ3ur7tQA/vZkny6Z7H+tB/M5KPVkv1nrk6Oz2h1tf5bvab32rwP+0Ar7RQXa + oUC2J/v3Be9hJacbWpDMpwEWm/Web+VbjYvqSJvJ3+Be00l9V3otspC2AV4RfyxyOjX6GT4lRfV+ + fKpys3QcT3TeOUH2b793siNJQ6cPinRKsxmEY5FTHOMfPfpI5kW1l9k75I8pUmu9gx5/FZR3HQ97 + FYf+n/7qO4s1hNrr6eFVcii2Slf2Vb2E2WKepRch79NRBu080QdHD9NFklSvfOmmzgnoOC7hj5Jy + hWIxar4iXWWCAnt/e0LjoU9Qg6Z7bXbYW9uW3aSqilq8+KCwBi2a5H/+w6QCxLbQUpnI2QMjRgm0 + iv180sCTMeHTKpCozOiw8vi43gvriWerbTFMCiapvYdLB2W9r8XfRU//sCBdQOsLlkN+JQFsul2P + Q+XMKnp1gxp1kGwRgmCfGkpKlXbGklK3BwyiokY5ohOJmthqVx8Zf3wIwrA87M212WDxyy+L4ff2 + hRb8q3eQBCO6jNW7GM91rqOf1zz6EfU6AaJHadZSP80pTb8/j69lsk40zuyvdahP4vEz1efxli7X + 1YZQekOomJHjHn1qXdL6j778J9QH0ynFpzc/Uv9hAB+9z5e9sw0VsItZa26dBB+IU+lXxaVCdA5H + oD9P1YeA6RDk51PN9D1j4A01k44/tkB/k9F2KE1sFZ1BpNkBe0on0y9pXzgHMHHWHXCnaTjNWnBC + 7PG/deAzjkx8FxCoe7BPCo6/o7x/sL+MoZ24DUt1pP6ttRFE0XeTFMwW/STH1dksjSPLJzSOjT43 + 4FuDvg94P4NGJZVZL+nqXtbr8cLlB3AM3eBVABX+e9sUSxWKHjxEsQBsdxg6FW4JQQ9qNVTFoO+T + 0rlDJT1bBasXRbIPHbS/+krtPqmg/epcQ1vd4iCZQk9fEpl+V1R60ESlKyXSVvf3yU//v+g/eDj7 + 5vTt6W/iv/p8QUbhf1FFySjDAmyHQ8uwHGfoPu1AMZde0P3DWdFcLqhocFEGk6qoUymXzXH9RZYm + N82cAJ3ffz8hRFq6684h1IqMTmZU60FEmoyupDaHJ0HUX41m/UPOK22z7avEKkT5KV37JbW5VYd1 + w+P4rXKblHprkGwQ1OGDZItRIvkclx2kCk8Si3KaZ4vJdIVyv6F9/9kySBby2PiK1hDHr7//SiF/ + bBxVfPhn9nGi9HPlH29R0+SpLdDJFla7S705zQn1RTzj/4AjJt+yc4p9qAAON+Pk9h6r6c0orEdr + uhsW82jNroerPFRqqptwlzFbTfpV+3btW0N/7AG1t/FMZouylb33B2uwqKXBDsSY3u5XZAdK8e3W + 4cUdKrzoanC8V/eHoIxtPZgFt1kaXCmxv4x1WoNZnmf2R7MhK18x3qlEC4wAvX/cOxAm5mf9gk1n + xUbH10FJ4V16+/A5C9nR3EXxB09NeVWW1GKjr5TJjLHISpz3o2S/M80bjt1dGqq7pusop827h+2x + xX0olLB8Vl6TMThmPL6aU/Ktgqr/04wvwKDfh2nPHthVS/uszY1aKutBlI1kVKpj/7FvRHJku5b0 + h34QWn5ojGzfNYYyMv1Q+lJalmmasl+AKZMEbszLeKR5o9AbRf5gaFljLxqY3sDwPcfxAzkwLdPx + hnY0NsbSWjcod0/vRdMHr06fc5TRk86c9mmFzhdY+T9q+v+4tME0uWkAAA== + headers: + accept-ranges: [bytes] + age: ['19'] + cache-control: ['no-cache, must-revalidate, s-maxage=3600'] + connection: [keep-alive] + content-encoding: [gzip] + content-length: ['8536'] + content-type: [text/html; charset=utf-8] + date: ['Fri, 14 Oct 2016 11:30:10 GMT'] + expires: ['Fri, 15 Oct 2004 12:00:00 GMT'] + server: [openresty] + server-name: [dalmozwww04.dal.moz.com] + set-cookie: ['visid_incap_133232=6hHJoJ60Qim/2AB9nERqEcHBAFgAAAAAQUIPAAAAAADNJNx7kcw7rFGPLfDjzdJd; + expires=Sat, 14 Oct 2017 08:44:17 GMT; path=/; Domain=.moz.com', incap_ses_305_133232=y0fjbIgnjC2XrzDQM5Q7BMHBAFgAAAAANwcfxib6ZSdGjoUT2YMLiA==; + path=/; Domain=.moz.com] + strict-transport-security: [max-age=31536000] + vary: [Accept-Encoding] + via: [1.1 varnish] + x-cdn: [Incapsula] + x-frame-options: [SAMEORIGIN] + x-iinfo: [0-4137914-4137198 PNNN RT(1476444608836 301) q(0 0 0 0) r(0 0) U5] + x-varnish: [462974108 462973962] + status: {code: 200, message: OK} +version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml new file mode 100644 index 00000000..e4322a71 --- /dev/null +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 +version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml new file mode 100644 index 00000000..278b8c51 --- /dev/null +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 +version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml new file mode 100644 index 00000000..efd8e6ff --- /dev/null +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", + "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec +version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml new file mode 100644 index 00000000..68bd163b --- /dev/null +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&remove=cgttc0%2Ccgttc1 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml new file mode 100644 index 00000000..320e5c63 --- /dev/null +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&remove=cgttc + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc +version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml new file mode 100644 index 00000000..a248c0c3 --- /dev/null +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -0,0 +1,18 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": + {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": + 1}, "twisted-test": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": + 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 +version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml new file mode 100644 index 00000000..d6d97d50 --- /dev/null +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -0,0 +1,17 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": + {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": + 1}}, "total_channels": 1, "total_occupancy": 1}, "service": "Presence"}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 +version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml new file mode 100644 index 00000000..b8a7994a --- /dev/null +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", + "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml new file mode 100644 index 00000000..680e1687 --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&store=0 + response: + body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml new file mode 100644 index 00000000..67f54947 --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -0,0 +1,18 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 403, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=fd7808cd-272f-46dc-a040-6a236ca23c38&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml new file mode 100644 index 00000000..fd221291 --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 400, message: ''} + url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml new file mode 100644 index 00000000..64df534b --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml new file mode 100644 index 00000000..d9dbcfe3 --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -0,0 +1,54 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml new file mode 100644 index 00000000..a02c17c9 --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -0,0 +1,54 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 +version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml new file mode 100644 index 00000000..5a3ef940 --- /dev/null +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml new file mode 100644 index 00000000..01522eb6 --- /dev/null +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.0&state=%7B%22whatever%22%3A+%22something%22%7D + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": + "something"}, "service": "Presence"}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=someuuid +version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml new file mode 100644 index 00000000..94c57187 --- /dev/null +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.0&state=%7B%22whatever%22%3A+%22something%22%7D + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": + "something"}, "service": "Presence"}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=someuuid +version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml new file mode 100644 index 00000000..05169d2b --- /dev/null +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": + ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 +version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml new file mode 100644 index 00000000..c07440df --- /dev/null +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -0,0 +1,16 @@ +interactions: +- request: + body: !!python/unicode + headers: + user-agent: [PubNub-Python-Twisted/4.0.0] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0 + response: + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": + ["twisted-test-1"]}, "service": "Presence"}'} + headers: !!python/object:twisted.web.http_headers.Headers + _rawHeaders: + user-agent: [PubNub-Python-Twisted/4.0.0] + status: {code: 200, message: ''} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f +version: 1 diff --git a/tests/integrational/twisted/test_cg.py b/tests/integrational/twisted/test_cg.py index e69de29b..6aa94e08 100644 --- a/tests/integrational/twisted/test_cg.py +++ b/tests/integrational/twisted/test_cg.py @@ -0,0 +1,101 @@ +import twisted + +from twisted.internet import reactor +from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ + PNChannelGroupsRemoveChannelResult +from pubnub.pubnub_twisted import PubNubTwisted + +from tests.helper import pnconf +from tests.integrational.vcr_helper import pn_vcr + +twisted.internet.base.DelayedCall.debug = True + + +class CGTestCase(unittest.TestCase): + def setUp(self): + self.pool = HTTPConnectionPool(reactor, persistent=False) + self.pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + def tearDown(self): + return self.pool.closeCachedConnections() + + def assert_valid_cg_envelope(self, envelope, type): + self.assertIsInstance(envelope.result, type) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/groups/add_single_channel.yaml', + filter_query_parameters=['uuid']) + def test_adding_channel(self): + channel = 'cgttc' + group = 'cgttg' + + envelope = yield self.pubnub.add_channel_to_channel_group() \ + .channels(channel).channel_group(group).deferred() + + self.assert_valid_cg_envelope(envelope, PNChannelGroupsAddChannelResult) + + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml', + filter_query_parameters=['uuid']) + def test_removing_channel(self): + channel = 'cgttc' + group = 'cgttg' + + envelope = yield self.pubnub.remove_channel_from_channel_group() \ + .channels(channel).channel_group(group).deferred() + + self.assert_valid_cg_envelope(envelope, PNChannelGroupsRemoveChannelResult) + + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/groups/add_channels.yaml', + filter_query_parameters=['uuid']) + def test_adding_channels(self): + channel = ['cgttc0', 'cgttc1'] + group = 'cgttg' + + envelope = yield self.pubnub.add_channel_to_channel_group() \ + .channels(channel).channel_group(group).deferred() + + self.assert_valid_cg_envelope(envelope, PNChannelGroupsAddChannelResult) + + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/groups/remove_channels.yaml', + filter_query_parameters=['uuid']) + def test_removing_channels(self): + channel = ['cgttc0', 'cgttc1'] + group = 'cgttg' + + envelope = yield self.pubnub.remove_channel_from_channel_group() \ + .channels(channel).channel_group(group).deferred() + + self.assert_valid_cg_envelope(envelope, PNChannelGroupsRemoveChannelResult) + + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/groups/list_channels.yaml', + filter_query_parameters=['uuid']) + def test_list_channels(self): + group = 'cgttg' + + envelope = yield self.pubnub.list_channels_in_channel_group() \ + .channel_group(group).deferred() + + self.assert_valid_cg_envelope(envelope, PNChannelGroupsListResult) + + returnValue(envelope) diff --git a/tests/integrational/twisted/test_here_now.py b/tests/integrational/twisted/test_here_now.py index e69de29b..0b38133d 100644 --- a/tests/integrational/twisted/test_here_now.py +++ b/tests/integrational/twisted/test_here_now.py @@ -0,0 +1,84 @@ +import twisted + +from twisted.internet import reactor +from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +from pubnub.models.consumer.presence import PNHereNowResult + +from pubnub.pubnub_twisted import PubNubTwisted, TwistedEnvelope + +from tests.helper import pnconf +from tests.integrational.vcr_helper import pn_vcr + +twisted.internet.base.DelayedCall.debug = True + +channel = 'twisted-test' +channels = 'twisted-test-1', 'twisted-test-1' + + +class HereNowTest(unittest.TestCase): + def setUp(self): + self.pool = HTTPConnectionPool(reactor, persistent=False) + self.pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + def tearDown(self): + return self.pool.closeCachedConnections() + + class PNHereNowChannelData(object): + def __init__(self, channel_name, occupancy, occupants): + self.channel_name = channel_name + self.occupancy = occupancy + self.occupants = occupants + + def assert_valid_here_now_envelope(self, envelope, result_channels): + def get_uuids(here_now_channel_data): + return [here_now_channel_data.channel_name, + here_now_channel_data.occupancy, + map(lambda x: x.uuid, here_now_channel_data.occupants)] + + self.assertIsInstance(envelope, TwistedEnvelope) + self.assertIsInstance(envelope.result, PNHereNowResult) + self.assertEqual(map(get_uuids, envelope.result.channels), result_channels) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/here_now/global.yaml', + filter_query_parameters=['uuid']) + def test_global_here_now(self): + envelope = yield self.pubnub.here_now() \ + .include_uuids(True) \ + .deferred() + + self.assert_valid_here_now_envelope(envelope, + [[u'twisted-test-1', 1, [u'00de2586-7ad8-4955-b5f6-87cae3215d02']], + [u'twisted-test', 1, [u'00de2586-7ad8-4955-b5f6-87cae3215d02']]]) + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/here_now/single.yaml', + filter_query_parameters=['uuid']) + def test_here_now_single_channel(self): + envelope = yield self.pubnub.here_now() \ + .channels(channel) \ + .include_uuids(True) \ + .deferred() + + self.assert_valid_here_now_envelope(envelope, [['twisted-test', 1, [u'00de2586-7ad8-4955-b5f6-87cae3215d02']]]) + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/here_now/multiple.yaml', + filter_query_parameters=['uuid']) + def test_here_now_multiple_channels(self): + envelope = yield self.pubnub.here_now() \ + .channels(channels) \ + .include_uuids(True) \ + .deferred() + + self.assert_valid_here_now_envelope(envelope, + [[u'twisted-test-1', 1, [u'00de2586-7ad8-4955-b5f6-87cae3215d02']]]) + returnValue(envelope) diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py index e69de29b..3bdce481 100644 --- a/tests/integrational/twisted/test_publish.py +++ b/tests/integrational/twisted/test_publish.py @@ -0,0 +1,183 @@ +import twisted +import pytest + +from twisted.internet import reactor +from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +from pubnub.exceptions import PubNubException +from pubnub.errors import PNERR_MESSAGE_MISSING, PNERR_CHANNEL_MISSING + +from pubnub.models.consumer.common import PNStatus +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration + +from pubnub.pubnub_twisted import PubNubTwisted, TwistedEnvelope, PubNubTwistedException + +from tests.helper import pnconf, pnconf_pam_copy, pnconf_enc_copy +from tests.integrational.vcr_helper import pn_vcr + +twisted.internet.base.DelayedCall.debug = True + +channel = 'twisted-test' + + +class PublishTestCase(unittest.TestCase): + def setUp(self): + self.pool = HTTPConnectionPool(reactor, persistent=False) + self.pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + def tearDown(self): + return self.pool.closeCachedConnections() + + # for async + def error_envelope_asserter(self, expected_err_msg): + def assert_error_message(envelope): + assert envelope.status.error_data.information == expected_err_msg + + return assert_error_message + + def assert_client_error(self, publish, message): + try: + publish.deferred() + except PubNubException as exception: + self.assertTrue(message in exception.message) + else: + self.fail('Expected PubNubException not raised') + + def assert_client_side_error(self, envelope, expected_err_msg): + assert envelope.status.error_data.information == expected_err_msg + + def assert_valid_publish_envelope(self, envelope): + assert isinstance(envelope, TwistedEnvelope) + assert isinstance(envelope.result, PNPublishResult) + assert isinstance(envelope.status, PNStatus) + assert envelope.result.timetoken > 0 + + @inlineCallbacks + def deferred(self, event): + envelope = yield event.deferred() + returnValue(envelope) + + @inlineCallbacks + def assert_success_publish_get(self, message, meta=None): + publish = self.pubnub.publish().channel(channel).message(message).meta(meta) + envelope = yield self.deferred(publish) + self.assert_valid_publish_envelope(envelope) + returnValue(envelope) + + @inlineCallbacks + def assert_success_encrypted_publish_get(self, message): + pubnub = PubNubTwisted(pnconf_enc_copy()) + publish = pubnub.publish().channel(channel).message(message) + envelope = yield self.deferred(publish) + self.assert_valid_publish_envelope(envelope) + returnValue(envelope) + + @inlineCallbacks + def assert_success_publish_post(self, message): + publish = self.pubnub.publish().channel(channel).message(message).use_post(True) + envelope = yield self.deferred(publish) + self.assert_valid_publish_envelope(envelope) + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_publish_mixed_via_get(self): + d0 = yield self.assert_success_publish_get("hi") + d1 = yield self.assert_success_publish_get(5) + d2 = yield self.assert_success_publish_get(True) + d3 = yield self.assert_success_publish_get(["hi", "hi2", "hi3"]) + returnValue([d0, d1, d2, d3]) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_publish_mixed_encrypted_via_get(self): + d0 = yield self.assert_success_encrypted_publish_get("hi") + d1 = yield self.assert_success_encrypted_publish_get(5) + d2 = yield self.assert_success_encrypted_publish_get(True) + d3 = yield self.assert_success_encrypted_publish_get(["hi", "hi2", "hi3"]) + returnValue([d0, d1, d2, d3]) + + # TODO: uncomment this when vcr for post is fixed + # @inlineCallbacks + # @pn_vcr.use_cassette( + # 'tests/integrational/fixtures/twisted/publish/mixed_via_post.yaml', + # filter_query_parameters=['uuid', 'seqn']) + # def test_publish_mixed_via_post(self): + # d0 = yield self.assert_success_publish_post("hi") + # d1 = yield self.assert_success_publish_post(5) + # d2 = yield self.assert_success_publish_post(True) + # d3 = yield self.assert_success_publish_post(["hi", "hi2", "hi3"]) + # returnValue([d0, d1, d2, d3]) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/object_via_get.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_publish_object_via_get(self): + d0 = yield self.assert_success_publish_get({"one": 2, "three": True}) + returnValue(d0) + + def test_error_missing_message(self): + self.assert_client_error( + self.pubnub.publish().channel(channel).message(None), + PNERR_MESSAGE_MISSING + ) + + def test_error_missing_channel(self): + self.assert_client_error( + self.pubnub.publish().channel('').message('whatever'), + PNERR_CHANNEL_MISSING + ) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/invalid_key.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_error_invalid_key(self): + conf = PNConfiguration() + conf.publish_key = "fake" + conf.subscribe_key = "demo" + pubnub = PubNubTwisted(conf) + with pytest.raises(PubNubTwistedException) as exception: + yield pubnub.publish().channel(channel).message("hey").deferred() + + self.assertEqual(exception.value.status.error_data.information, + "HTTP Client Error (400): [0, u'Invalid Key', u'14767989321048626']") + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/forbidden.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_error_forbidden(self): + pubnub = PubNubTwisted(pnconf_pam_copy()) + with pytest.raises(PubNubTwistedException) as exception: + yield pubnub.publish().channel("not_permitted_channel").message("hey").deferred() + + self.assertEqual(exception.value.status.error_data.information, + "HTTP Client Error (403): {u'status': 403, u'message': u'Forbidden', u'payload':" + " {u'channels': [u'not_permitted_channel']}, u'service': u'Access Manager', u'error': True}") + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/meta_object.yaml', + filter_query_parameters=['uuid', 'seqn'], + match_on=['host', 'method', 'path', 'meta_object_in_query']) + def test_publish_with_meta(self): + yield self.assert_success_publish_get('hi', {'a': 2, 'b': True}) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/publish/do_not_store.yaml', + filter_query_parameters=['uuid', 'seqn']) + def test_publish_do_not_store(self): + publish = self.pubnub.publish().channel(channel).message('whatever').should_store(False) + envelope = yield self.deferred(publish) + self.assert_valid_publish_envelope(envelope) + returnValue(envelope) diff --git a/tests/integrational/twisted/test_state.py b/tests/integrational/twisted/test_state.py index e69de29b..2c0c6402 100644 --- a/tests/integrational/twisted/test_state.py +++ b/tests/integrational/twisted/test_state.py @@ -0,0 +1,55 @@ +from copy import copy + +import twisted + +from twisted.internet import reactor +from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +from pubnub.models.consumer.presence import PNSetStateResult + +from pubnub.pubnub_twisted import PubNubTwisted, TwistedEnvelope + +from tests.helper import pnconf +from tests.integrational.vcr_helper import pn_vcr + +twisted.internet.base.DelayedCall.debug = True + +channel = 'twisted-test' +channels = ['twisted-test-0', 'twisted-test-1'] +state = {'whatever': 'something'} + + +class StateTestCase(unittest.TestCase): + def setUp(self): + pnconf_uuid_set = copy(pnconf) + pnconf_uuid_set.uuid = 'someuuid' + self.pool = HTTPConnectionPool(reactor, persistent=False) + self.pubnub = PubNubTwisted(pnconf_uuid_set, reactor=reactor, pool=self.pool) + + def tearDown(self): + return self.pool.closeCachedConnections() + + def assert_valid_state_envelope(self, envelope): + self.assertIsInstance(envelope, TwistedEnvelope) + self.assertIsInstance(envelope.result, PNSetStateResult) + self.assertEqual(envelope.result.state, state) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/state/single_channel.yaml', + filter_query_parameters=['uuid']) + def test_state_single_channel(self): + envelope = yield self.pubnub.set_state().channels(channel).state(state).deferred() + self.assert_valid_state_envelope(envelope) + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/state/multiple_channels.yaml', + filter_query_parameters=['uuid']) + def test_state_multiple_channels(self): + envelope = yield self.pubnub.set_state().channels(channels).state(state).deferred() + self.assert_valid_state_envelope(envelope) + returnValue(envelope) diff --git a/tests/integrational/twisted/test_where_now.py b/tests/integrational/twisted/test_where_now.py index e69de29b..dea8d971 100644 --- a/tests/integrational/twisted/test_where_now.py +++ b/tests/integrational/twisted/test_where_now.py @@ -0,0 +1,49 @@ +import twisted + +from twisted.internet import reactor +from twisted.internet.defer import inlineCallbacks, returnValue +from twisted.trial import unittest +from twisted.web.client import HTTPConnectionPool + +from pubnub.models.consumer.presence import PNWhereNowResult + +from pubnub.pubnub_twisted import PubNubTwisted, TwistedEnvelope + +from tests.helper import pnconf +from tests.integrational.vcr_helper import pn_vcr + +twisted.internet.base.DelayedCall.debug = True + +uuid_looking_for = '00de2586-7ad8-4955-b5f6-87cae3215d02' + + +class WhereNowTestCase(unittest.TestCase): + def setUp(self): + self.pool = HTTPConnectionPool(reactor, persistent=False) + self.pubnub = PubNubTwisted(pnconf, reactor=reactor, pool=self.pool) + + def tearDown(self): + return self.pool.closeCachedConnections() + + def assert_valid_where_now_envelope(self, envelope, channels): + self.assertIsInstance(envelope, TwistedEnvelope) + self.assertIsInstance(envelope.result, PNWhereNowResult) + self.assertEqual(envelope.result.channels, channels) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/where_now/single.yaml', + filter_query_parameters=['uuid']) + def test_where_now_single_channel(self): + envelope = yield self.pubnub.where_now().uuid(uuid_looking_for).deferred() + self.assert_valid_where_now_envelope(envelope, [u'twisted-test-1']) + returnValue(envelope) + + @inlineCallbacks + @pn_vcr.use_cassette( + 'tests/integrational/fixtures/twisted/where_now/multiple.yaml', + filter_query_parameters=['uuid']) + def test_where_now_multiple_channels(self): + envelope = yield self.pubnub.where_now().uuid(uuid_looking_for).deferred() + self.assert_valid_where_now_envelope(envelope, [u'twisted-test-2', u'twisted-test-1']) + returnValue(envelope) From b84b073ad5204d1044418378546b7159b09238f1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 20 Oct 2016 03:27:35 -0700 Subject: [PATCH 373/468] Add super-admin mode --- pubnub.py | 72 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 24 deletions(-) diff --git a/pubnub.py b/pubnub.py index 1f0182f6..a398edf2 100755 --- a/pubnub.py +++ b/pubnub.py @@ -346,16 +346,13 @@ def _pam_sign(self, msg): msg.encode("utf-8"), sha256 ).digest()) - return quote(sign, safe="") + return quote(sign, safe="=") def set_u(self, u=False): self.u = u def _pam_auth(self, query, apicode=0, callback=None, error=None): - if 'timestamp' not in query: - query['timestamp'] = int(time.time()) - ## Global Grant? if 'auth' in query and not query['auth']: del query['auth'] @@ -366,19 +363,6 @@ def _pam_auth(self, query, apicode=0, callback=None, error=None): if 'channel-group' in query and not query['channel-group']: del query['channel-group'] - params = "&".join([ - x + "=" + quote( - str(query[x]), safe="" - ) for x in sorted(query) - ]) - sign_input = "{subkey}\n{pubkey}\n{apitype}\n{params}".format( - subkey=self.subscribe_key, - pubkey=self.publish_key, - apitype="audit" if (apicode) else "grant", - params=params - ) - query['signature'] = self._pam_sign(sign_input) - return self._request({"urlcomponents": [ 'v1', 'auth', "audit" if (apicode) else "grant", 'sub-key', @@ -1293,12 +1277,49 @@ def getUrl(self, request, encoder_map=None): if self.u is True and "urlparams" in request: request['urlparams']['u'] = str(random.randint(1, 100000000000)) - ## Build URL - url = self.origin + '/' + "/".join([ - "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and - hex(ord(ch)).replace('0x', '%').upper() or - ch for ch in list(bit) - ]) for bit in request["urlcomponents"]]) + + path = '/' + "/".join([ + "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and + hex(ord(ch)).replace('0x', '%').upper() or + ch for ch in list(bit) + ]) for bit in request["urlcomponents"]]) + + url = self.origin + path + url_params = request['urlparams'] if 'urlparams' in request else None + + if url_params and 'auth' in url_params and not url_params['auth']: + del request['urlparams']['auth'] + + if self.secret_key is not None and url_params: + if url_params and 'timestamp' not in url_params: + url_params['timestamp'] = int(time.time()) + request['urlparams']['timestamp'] = url_params['timestamp'] + + second = request['urlcomponents'][2] if len(request['urlcomponents']) >= 3 else None + is_grant = second == "grant" + is_audit = second == "audit" + + if is_grant: + third = "grant" + elif is_audit: + third = "audit" + else: + third = path + + params = "&".join([ + x + "=" + quote( + str(url_params[x]), safe="" + ) for x in sorted(url_params) + ]) + + sign_input = "{subkey}\n{pubkey}\n{third}\n{params}".format( + subkey=self.subscribe_key, + pubkey=self.publish_key, + third=third, + params=params + ) + + request['urlparams']['signature'] = self._pam_sign(sign_input) if ("urlparams" in request): url = url + '?' + "&".join([x + "=" + @@ -2351,7 +2372,10 @@ def sub_callback(response): channel_list = ',' data = {"uuid": self.uuid, "auth": self.auth_key, - 'pnsdk': self.pnsdk, 'channel-group': channel_group_list} + 'pnsdk': self.pnsdk} + + if channel_group_list is not None and len(channel_group_list) > 0: + data['channel-group'] = channel_group_list st = json.dumps(self.STATE) From 600ba089743c3ece3ed7e9c829d37ccac2c8deff Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Tue, 25 Oct 2016 17:16:25 +0200 Subject: [PATCH 374/468] Few small fixes --- pubnub/managers.py | 1 - pubnub/pubnub_asyncio.py | 4 +++ pubnub/pubnub_tornado.py | 2 ++ pubnub/pubnub_twisted.py | 33 ++++++++++++------- .../fixtures/twisted/publish/forbidden.yaml | 6 ++-- tests/integrational/twisted/test_publish.py | 2 +- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/pubnub/managers.py b/pubnub/managers.py index d45cbd31..bf9ae3bb 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -19,7 +19,6 @@ def get_next_sequence(self): self.next_sequence = 1 else: self.next_sequence += 1 - return self.next_sequence diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index e4a08438..dff8f912 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -49,6 +49,10 @@ def set_connector(self, cn): self._connector = cn self._session = aiohttp.ClientSession(loop=self.event_loop, connector=self._connector) + def start(self): + if self._subscription_manager is not None: + self._subscription_manager._start_worker() + def stop(self): self._session.close() if self._subscription_manager is not None: diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index f31666ba..61e55690 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -39,6 +39,8 @@ def stop(self): self.ioloop.stop() def start(self): + if self._subscription_manager is not None: + self._subscription_manager._start_worker() self.ioloop.start() def timeout(self, delay, callback, *args): diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 85907eb6..6f87c493 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -59,6 +59,7 @@ def __init__(self, pubnub_instance): self.worker_loop = None self._heartbeat_loop = None self._heartbeat_call = None + self.clock = pubnub_instance.clock super(TwistedSubscriptionManager, self).__init__(pubnub_instance) def _announce_status(self, status): @@ -66,7 +67,12 @@ def _announce_status(self, status): def _start_worker(self): consumer = TwistedSubscribeMessageWorker(self._pubnub, self._listener_manager, self._message_queue, None) - self.worker_loop = LoopingCall(consumer.run).start(0.1, False) + looping_call = LoopingCall(consumer.run) + + if self.clock is not None: + looping_call.clock = self.clock + + self.worker_loop = looping_call.start(0.1, False) def _set_consumer_event(self): raise NotImplementedError @@ -101,7 +107,6 @@ def manage_failure(failure): time.sleep(30) # TODO: SET VALUE ACCORDING TO DOCS self._start_subscribe_loop() else: - print(failure) return failure try: @@ -178,11 +183,14 @@ class PubNubTwisted(PubNubCore): def sdk_platform(self): return "-Twisted" - def __init__(self, config, pool=None, reactor=None): + def __init__(self, config, pool=None, reactor=None, clock=None): super(PubNubTwisted, self).__init__(config) + self.clock = clock self._publish_sequence_manager = PublishSequenceManager(PubNubCore.MAX_SEQUENCE) - self._subscription_manager = TwistedSubscriptionManager(self) + + if self.config.enable_subscribe: + self._subscription_manager = TwistedSubscriptionManager(self) self.disconnected_times = 0 @@ -203,9 +211,11 @@ def __init__(self, config, pool=None, reactor=None): 'User-Agent': [self.sdk_name], } - def start(self): - self._subscription_manager._start_worker() - self.reactor.run() + def start(self, skip_reactor=False): + if self._subscription_manager is not None: + self._subscription_manager._start_worker() + if not skip_reactor: + self.reactor.run() def stop(self): self.reactor.stop() @@ -243,9 +253,12 @@ def request_deferred(self, options_func, cancellation_event): reactor = self.reactor pnconn_pool = self.pnconn_pool headers = self.headers + params_to_merge_in = {} + + if options.operation_type == PNOperationType.PNPublishOperation: + params_to_merge_in['seqn'] = self._publish_sequence_manager.get_next_sequence() - if options.operation_type is PNOperationType.PNPublishOperation: - options.params['seqn'] = self._publish_sequence_manager.get_next_sequence() + options.merge_params_in(params_to_merge_in) create_response = options.create_response create_status_response = options.create_status @@ -254,7 +267,6 @@ def request_deferred(self, options_func, cancellation_event): options.path, options.query_string) logger.debug("%s %s %s" % (options.method_string, url, options.data)) - print("%s %s %s" % (options.method_string, url, options.data)) def handler(): agent = Agent(reactor, pool=pnconn_pool) @@ -263,7 +275,6 @@ def handler(): body = FileBodyProducer(StringIO(options.data)) else: body = None - request = agent.request( options.method_string, url, diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index 67f54947..b3def76f 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -4,9 +4,9 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.0] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: - body: {string: !!python/unicode '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access + body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} '} @@ -14,5 +14,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.0] status: {code: 403, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=fd7808cd-272f-46dc-a040-6a236ca23c38&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.0&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/twisted/test_publish.py b/tests/integrational/twisted/test_publish.py index 3bdce481..77cee7ec 100644 --- a/tests/integrational/twisted/test_publish.py +++ b/tests/integrational/twisted/test_publish.py @@ -154,7 +154,7 @@ def test_error_invalid_key(self): @inlineCallbacks @pn_vcr.use_cassette( 'tests/integrational/fixtures/twisted/publish/forbidden.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'timestamp', 'signature']) def test_error_forbidden(self): pubnub = PubNubTwisted(pnconf_pam_copy()) with pytest.raises(PubNubTwistedException) as exception: From 5d156e8b92e25f0999d9a27ae889b66b4d52bf05 Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Wed, 26 Oct 2016 17:41:16 +0200 Subject: [PATCH 375/468] start worker adjustment --- examples/twisted/basic_usage.py | 61 +++++++++++++++++++++++++++++++++ examples/twisted/here_now.py | 31 ----------------- examples/twisted/publish.py | 58 ------------------------------- pubnub/pubnub_twisted.py | 10 ++---- 4 files changed, 64 insertions(+), 96 deletions(-) create mode 100644 examples/twisted/basic_usage.py delete mode 100644 examples/twisted/here_now.py delete mode 100644 examples/twisted/publish.py diff --git a/examples/twisted/basic_usage.py b/examples/twisted/basic_usage.py new file mode 100644 index 00000000..8694d685 --- /dev/null +++ b/examples/twisted/basic_usage.py @@ -0,0 +1,61 @@ +from pubnub.enums import PNStatusCategory +from pubnub.pubnub_twisted import PubNubTwisted as PubNub +from pubnub.pnconfiguration import PNConfiguration +from twisted.internet import reactor +from pubnub.callbacks import SubscribeCallback + + +def main(): + pnconf = PNConfiguration() + pnconf.subscribe_key = 'demo' + pnconf.publish_key = 'demo' + + pubnub = PubNub(pnconf) + + def my_publish_callback(result, status): + # Check whether request successfully completed or not + if not status.is_error(): + envelope = result + pass # Message successfully published to specified channel. + else: + pass # Handle message publish error. Check 'category' property to find out possible issue + # because of which request did fail. + # Request can be resent using: [status retry]; + + class MySubscribeCallback(SubscribeCallback): + def presence(self, pubnub, presence): + pass # handle incoming presence data + + def status(self, pubnub, status): + if status.category == PNStatusCategory.PNUnexpectedDisconnectCategory: + pass # This event happens when radio / connectivity is lost + + elif status.category == PNStatusCategory.PNConnectedCategory: + # Connect event. You can do stuff like publish, and know you'll get it. + # Or just use the connected event to confirm you are subscribed for + # UI / internal notifications, etc + pubnub.publish().channel("awesome_channel").message("Hello!").async(my_publish_callback), + + elif status.category == PNStatusCategory.PNReconnectedCategory: + pass + # Happens as part of our regular operation. This event happens when + # radio / connectivity is lost, then regained. + elif status.category == PNStatusCategory.PNDecryptionErrorCategory: + pass + # Handle message decryption error. Probably client configured to + # encrypt messages and on live data feed it received plain text. + + def message(self, pubnub, message): + # Handle new message stored in message.message + pass + + pubnub.add_listener(MySubscribeCallback()) + pubnub.subscribe().channels('awesome_channel').execute() + + reactor.callLater(30, pubnub.stop) # stop reactor loop after 30 seconds + + pubnub.start() + + +if __name__ == '__main__': + main() \ No newline at end of file diff --git a/examples/twisted/here_now.py b/examples/twisted/here_now.py deleted file mode 100644 index 84f83225..00000000 --- a/examples/twisted/here_now.py +++ /dev/null @@ -1,31 +0,0 @@ -# PubNub HereNow usage example -import sys - -sys.path.append("../../") - -from pubnub.pubnub_twisted import PubNubTwisted -from pubnub.pnconfiguration import PNConfiguration - - -pnconf = PNConfiguration() -pubnub = PubNubTwisted(pnconf) - - -def success(res): - print("success") - print(res.total_occupancy) - pubnub.stop() - - -def error(err): - print("error") - print(err) - pubnub.stop() - - -pubnub.here_now() \ - .channels(["ch1", "ch2", "ch3", "demo"]) \ - .include_state(False) \ - .async(success, error) - -pubnub.start() diff --git a/examples/twisted/publish.py b/examples/twisted/publish.py deleted file mode 100644 index ba7fc48e..00000000 --- a/examples/twisted/publish.py +++ /dev/null @@ -1,58 +0,0 @@ -# PubNub HereNow usage example -import sys - -sys.path.append("../../") - -from examples import pnconf -from pubnub.pubnub_twisted import PubNubTwisted - - -pubnub = PubNubTwisted(pnconf) - - -def successHandler(env): - print("success >>>") - print(env.result.timetoken) - pubnub.stop() - - -def errorHandler(err): - print("error >>>") - print(err) - pubnub.stop() - - -def async_callback(result, status): - if status.is_error(): - print("async error >>>") - print(status.error_data.information) - else: - print("async result >>>") - print(result.timetoken) - - -# using deferred: -deferred = pubnub.publish() \ - .channel("my_channel") \ - .message("hey")\ - .deferred() - -deferred.addCallback(successHandler) -deferred.addErrback(errorHandler) - -# using deferred: -deferred = pubnub.publish() \ - .channel("my_channel") \ - .message("hey")\ - .deferred() - -deferred.addCallback(successHandler) -deferred.addErrback(errorHandler) - -# using async: -pubnub.publish() \ - .channel("my_channel") \ - .message("hey")\ - .async(async_callback) - -pubnub.start() diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 6f87c493..832c22f5 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -169,13 +169,9 @@ def announce_leave_status(response, status): .async(announce_leave_status) def reconnect(self): - if self.worker_loop is not None: - self._start_subscribe_loop() - self._register_heartbeat_timer() - else: - # TODO: actual error - pass - + # TODO: REVIEW + self._start_subscribe_loop() + self._register_heartbeat_timer() class PubNubTwisted(PubNubCore): """PubNub Python API for Twisted framework""" From 3cdf29f26347881f4f448e47fc6b4b8de818ab06 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 27 Oct 2016 08:30:56 -0700 Subject: [PATCH 376/468] Fix history tests --- pubnub.py | 52 ++++++++++++++++++++++++++---------- python/tests/test_history.py | 11 ++++---- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/pubnub.py b/pubnub.py index a398edf2..88d13c7e 100755 --- a/pubnub.py +++ b/pubnub.py @@ -777,10 +777,18 @@ def publish(self, channel, message, store=True, replicate=True, callback=None, e """ - norep = 'false' if replicate else 'true' - store = '1' if store else '0' + params = { + 'pnsdk': self.pnsdk + } + + if self.auth_key: + params['auth'] = self.auth_key - message = self.encrypt(message) + if not store: + params['store'] = '0' + + if not replicate: + params['norep'] = 'true' # Send Message return self._request({"urlcomponents": [ @@ -790,8 +798,8 @@ def publish(self, channel, message, store=True, replicate=True, callback=None, e '0', channel, '0', - message - ], 'urlparams': {'auth': self.auth_key, 'pnsdk': self.pnsdk, 'store': store, 'norep': norep}}, + self.encrypt(message) + ], 'urlparams': params}, callback=self._return_wrapped_callback(callback), error=self._return_wrapped_callback(error)) @@ -1213,13 +1221,26 @@ def _history_callback(resp): params = dict() - params['count'] = count - params['reverse'] = reverse - params['start'] = start - params['end'] = end - params['auth'] = self.auth_key + params['reverse'] = 'true' if reverse else 'false' params['pnsdk'] = self.pnsdk - params['include_token'] = 'true' if include_token else 'false' + params['stringtoken'] = 'true' + params['auth'] = self.auth_key + + if include_token is not None: + params['include_token'] = 'true' if include_token else 'false' + + if count is not None and (int(count) > 100 or int(count) < 1): + raise AttributeError("Message count should be '0 < count <= 100'") + elif count is not None: + params['count'] = count + else: + params['count'] = 100 + + if start is not None and int(start) > 0: + params['start'] = start + + if end is not None and int(end) > 0: + params['end'] = end # Get History return _get_decrypted_history(self._request({'urlcomponents': [ @@ -1274,18 +1295,18 @@ def _encode_pam(self, val): return val def getUrl(self, request, encoder_map=None): - if self.u is True and "urlparams" in request: request['urlparams']['u'] = str(random.randint(1, 100000000000)) path = '/' + "/".join([ - "".join([' ~`!@#$%^&*()+=[]\\{}|;\':",./<>?'.find(ch) > -1 and + "".join([' ~`!@#$%^&()+=[]\\{}|;\':",/<>?'.find(ch) > -1 and hex(ord(ch)).replace('0x', '%').upper() or ch for ch in list(bit) ]) for bit in request["urlcomponents"]]) url = self.origin + path url_params = request['urlparams'] if 'urlparams' in request else None + signature = None if url_params and 'auth' in url_params and not url_params['auth']: del request['urlparams']['auth'] @@ -1319,12 +1340,15 @@ def getUrl(self, request, encoder_map=None): params=params ) - request['urlparams']['signature'] = self._pam_sign(sign_input) + signature = self._pam_sign(sign_input) if ("urlparams" in request): url = url + '?' + "&".join([x + "=" + (self._encode_param(str(y)) if encoder_map is None or x not in encoder_map else encoder_map[x](str(y))) for x, y in request["urlparams"].items() if y is not None and len(str(y)) > 0]) + if signature is not None: + url = url + "&signature=" + signature + if self.http_debug is not None: self.http_debug(url) return url diff --git a/python/tests/test_history.py b/python/tests/test_history.py index 64ee7f00..6926ec0a 100755 --- a/python/tests/test_history.py +++ b/python/tests/test_history.py @@ -6,7 +6,8 @@ pubnub = Pubnub("ds", "ds") pubnub_enc = Pubnub(publish_key="ds", subscribe_key="ds", cipher_key="enigma") -pubnub_pam = Pubnub(publish_key="pam", subscribe_key="pam", secret_key="pam") +pubnub_super_pam = Pubnub(publish_key="pam", subscribe_key="pam", secret_key="pam") +pubnub_pam = Pubnub(publish_key="pam", subscribe_key="pam") def rand(msg): @@ -20,7 +21,7 @@ def rand(msg): def setup_func(): - pubnub_pam.grant(channel=channel_pam, read=True, write=True, ttl=144000) + pubnub_super_pam.grant(channel=channel_pam, read=True, write=True, ttl=144000) for i in range(0, 20): msg = rand("message-" + str(i)) @@ -28,7 +29,7 @@ def setup_func(): print(pubnub.publish(channel=channel, message=msg)) # Fails with Python 3 # print(pubnub_enc.publish(channel=channel_enc, message=msg)) - print(pubnub_pam.publish(channel=channel_pam, message=msg)) + print(pubnub_super_pam.publish(channel=channel_pam, message=msg)) @with_setup(setup_func) @@ -37,7 +38,7 @@ def test_1(): hresp = pubnub.history(channel=channel, count=20) # Fails with Python 3 # hresp2 = pubnub_enc.history(channel=channel_enc, count=20) - hresp3 = pubnub_pam.history(channel=channel_pam, count=20) + hresp3 = pubnub_super_pam.history(channel=channel_pam, count=20) hresp4 = pubnub_pam.history(channel=channel_pam + "no_rw", count=20) assert hresp[0] == messages # Fails with Python 3 @@ -52,7 +53,7 @@ def test_2(): hresp = pubnub.history(channel=channel, count=20, include_token=True) # Fails with Python 3 # hresp2 = pubnub_enc.history(channel=channel_enc, count=20, include_token=True) - hresp3 = pubnub_pam.history(channel=channel_pam, count=20, include_token=True) + hresp3 = pubnub_super_pam.history(channel=channel_pam, count=20, include_token=True) hresp4 = pubnub_pam.history(channel=channel_pam + "no_rw", count=20, include_token=True) assert len(hresp[0]) == len(messages) assert hresp[0][0]['timetoken'] From 9714b6877b9e92c91ea152a3c5045e2cafc9a4d5 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 27 Oct 2016 09:29:32 -0700 Subject: [PATCH 377/468] Fix incorrect indentation --- pubnub.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pubnub.py b/pubnub.py index 88d13c7e..beb5e713 100755 --- a/pubnub.py +++ b/pubnub.py @@ -1299,10 +1299,10 @@ def getUrl(self, request, encoder_map=None): request['urlparams']['u'] = str(random.randint(1, 100000000000)) path = '/' + "/".join([ - "".join([' ~`!@#$%^&()+=[]\\{}|;\':",/<>?'.find(ch) > -1 and - hex(ord(ch)).replace('0x', '%').upper() or - ch for ch in list(bit) - ]) for bit in request["urlcomponents"]]) + "".join([' ~`!@#$%^&()+=[]\\{}|;\':",/<>?'.find(ch) > -1 and + hex(ord(ch)).replace('0x', '%').upper() or + ch for ch in list(bit) + ]) for bit in request["urlcomponents"]]) # NOQA: E124 url = self.origin + path url_params = request['urlparams'] if 'urlparams' in request else None @@ -1328,10 +1328,10 @@ def getUrl(self, request, encoder_map=None): third = path params = "&".join([ - x + "=" + quote( - str(url_params[x]), safe="" - ) for x in sorted(url_params) - ]) + x + "=" + quote( + str(url_params[x]), safe="" + ) for x in sorted(url_params) + ]) sign_input = "{subkey}\n{pubkey}\n{third}\n{params}".format( subkey=self.subscribe_key, From ce9d2a833f73f75cc019b85031b80bcc404cd608 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 28 Oct 2016 14:27:09 -0700 Subject: [PATCH 378/468] update dependencies --- pubnub/crypto.py | 4 ++-- setup.py | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pubnub/crypto.py b/pubnub/crypto.py index ec6dfb47..073ae802 100644 --- a/pubnub/crypto.py +++ b/pubnub/crypto.py @@ -1,7 +1,7 @@ import hashlib import json -from Crypto.Cipher import AES +from Cryptodome.Cipher import AES try: from base64 import decodebytes, encodebytes @@ -14,7 +14,7 @@ from hashlib import sha256 digestmod = sha256 except ImportError: - import Crypto.Hash.SHA256 as digestmod + import Cryptodome.Hash.SHA256 as digestmod sha256 = digestmod.new if sys.version_info > (3, 0): diff --git a/setup.py b/setup.py index e6756531..bc69349d 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ author='PubNub', author_email='support@pubnub.com', url='http://pubnub.com', - py_modules=['pubnub'], + modules=['pubnub'], license='MIT', classifiers=( 'Development Status :: 5 - Production/Stable', @@ -18,6 +18,10 @@ 'Topic :: Internet :: WWW/HTTP', 'Topic :: Software Development :: Libraries :: Python Modules', ), - install_requires=[], + install_requires=[ + 'pycryptodomex>=3.3', + 'requests>=2.4', + 'six>=1.10' + ], zip_safe=False, ) From e39cb854c52d5e90f5f7a1dae4270bce8e348ce3 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 28 Oct 2016 14:27:27 -0700 Subject: [PATCH 379/468] bump beta up --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bc69349d..b8d85ca2 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.0.beta1', + version='4.0.0.beta2', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 7da2383a7585c472e8107f902f3dd60a1145fa4a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 29 Oct 2016 15:42:15 -0700 Subject: [PATCH 380/468] Fix encryption --- pubnub/crypto.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pubnub/crypto.py b/pubnub/crypto.py index 073ae802..00e22e34 100644 --- a/pubnub/crypto.py +++ b/pubnub/crypto.py @@ -47,20 +47,23 @@ def get_secret(key): def encrypt(key, msg): secret = get_secret(key) - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + if v == 3: + cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) return encodebytes(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") else: + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) return encodestring(cipher.encrypt(pad(msg))).replace("\n", "") def decrypt(key, msg): secret = get_secret(key) - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) if v == 3: + cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) plain = depad((cipher.decrypt(decodebytes(msg.encode('utf-8')))).decode('utf-8')) else: + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) plain = depad(cipher.decrypt(decodestring(msg))) try: From 20bd952b9de8b38a34af128c01033ee5219cc0f1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 29 Oct 2016 16:21:33 -0700 Subject: [PATCH 381/468] Fix message worker start invocations --- pubnub/pubnub.py | 1 + pubnub/pubnub_asyncio.py | 6 ++---- pubnub/pubnub_tornado.py | 3 +-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index ae221c7f..3ff923d2 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -102,6 +102,7 @@ def __init__(self, pubnub_instance): self._subscribe_call = None self._heartbeat_periodic_callback = None super(NativeSubscriptionManager, self).__init__(pubnub_instance) + self._start_worker() def _send_leave(self, unsubscribe_operation): def leave_callback(result, status): diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index dff8f912..bd7c4cf0 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -49,10 +49,6 @@ def set_connector(self, cn): self._connector = cn self._session = aiohttp.ClientSession(loop=self.event_loop, connector=self._connector) - def start(self): - if self._subscription_manager is not None: - self._subscription_manager._start_worker() - def stop(self): self._session.close() if self._subscription_manager is not None: @@ -224,11 +220,13 @@ def get_next_sequence(self): class AsyncioSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): + self._message_worker = None self._message_queue = Queue() self._subscription_lock = Semaphore(1) self._subscribe_loop_task = None self._heartbeat_periodic_callback = None super(AsyncioSubscriptionManager, self).__init__(pubnub_instance) + self._start_worker() def _set_consumer_event(self): if not self._message_worker.cancelled(): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 61e55690..95bf3bc1 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -39,8 +39,6 @@ def stop(self): self.ioloop.stop() def start(self): - if self._subscription_manager is not None: - self._subscription_manager._start_worker() self.ioloop.start() def timeout(self, delay, callback, *args): @@ -251,6 +249,7 @@ def __init__(self, pubnub_instance): self._heartbeat_periodic_callback = None self._cancellation_event = None super(TornadoSubscriptionManager, self).__init__(pubnub_instance) + self._start_worker() def _set_consumer_event(self): self._consumer_event.set() From c260ddfd16b3480263b47ed048f9e3bfdcafbeea Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 29 Oct 2016 16:27:20 -0700 Subject: [PATCH 382/468] Reformat pubnub_twisted.py to fit pep8 requirements --- pubnub/pubnub_twisted.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pubnub/pubnub_twisted.py b/pubnub/pubnub_twisted.py index 832c22f5..b01c09f7 100644 --- a/pubnub/pubnub_twisted.py +++ b/pubnub/pubnub_twisted.py @@ -173,6 +173,7 @@ def reconnect(self): self._start_subscribe_loop() self._register_heartbeat_timer() + class PubNubTwisted(PubNubCore): """PubNub Python API for Twisted framework""" From 082dfe494f073db9eb13152a6e115712d4dde26a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sat, 29 Oct 2016 16:34:12 -0700 Subject: [PATCH 383/468] Replace pycrypto with pycryptodomex in requirements file --- requirements-dev.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index e7332b1a..cbf5ed15 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ pytest pytest-cov codecov -pycrypto +pycryptodomex pytest-benchmark --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy From 96596f5312d95f7d5403aa0b89c80273f9f84933 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 30 Oct 2016 05:57:55 -0700 Subject: [PATCH 384/468] Fix here_now groups query key name --- pubnub/endpoints/presence/here_now.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/endpoints/presence/here_now.py b/pubnub/endpoints/presence/here_now.py index 91d152cc..83afe6e6 100644 --- a/pubnub/endpoints/presence/here_now.py +++ b/pubnub/endpoints/presence/here_now.py @@ -35,7 +35,7 @@ def custom_params(self): params = {} if len(self._channel_groups) > 0: - params['channel-groups'] = utils.join_items_and_encode(self._channel_groups) + params['channel-group'] = utils.join_items_and_encode(self._channel_groups) if self._include_state: params['state'] = "1" From 7062297448efb066a4d0585e1e4b84274f7dc14b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 30 Oct 2016 13:44:06 -0700 Subject: [PATCH 385/468] Add super admin mode tests --- pubnub/endpoints/endpoint.py | 6 ++++ pubnub/endpoints/presence/set_state.py | 2 +- pubnub/endpoints/pubsub/publish.py | 3 +- .../asyncio/test_channel_groups.py | 34 ++++++++++++++++++- tests/integrational/asyncio/test_here_now.py | 23 ++++++++++++- tests/integrational/asyncio/test_publish.py | 16 ++++++++- tests/integrational/asyncio/test_state.py | 26 +++++++++++++- tests/integrational/asyncio/test_where_now.py | 18 +++++++++- .../integrational/native_sync/test_history.py | 26 ++++++++++++-- 9 files changed, 144 insertions(+), 10 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index f5d5009f..22eba984 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -158,6 +158,12 @@ def callback(params_to_merge): signed_input += utils.prepare_pam_arguments(custom_params) signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) + # REVIEW: add encoder map to not hardcode encoding here + if operation_type == PNOperationType.PNPublishOperation and 'meta' in custom_params: + custom_params['meta'] = utils.url_encode(custom_params['meta']) + if operation_type == PNOperationType.PNSetStateOperation and 'state' in custom_params: + custom_params['state'] = utils.url_encode(custom_params['state']) + custom_params['signature'] = signature # reassign since pnsdk should be signed unencoded diff --git a/pubnub/endpoints/presence/set_state.py b/pubnub/endpoints/presence/set_state.py index 7db347ed..be8b9b56 100644 --- a/pubnub/endpoints/presence/set_state.py +++ b/pubnub/endpoints/presence/set_state.py @@ -38,7 +38,7 @@ def custom_params(self): state=self._state )) - params = {'state': utils.url_encode(utils.write_value_as_string(self._state))} + params = {'state': utils.write_value_as_string(self._state)} if len(self._groups) > 0: params['channel-group'] = utils.join_items_and_encode(self._groups) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 52a8104d..52d73981 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -54,7 +54,7 @@ def custom_params(self): params = {} if self._meta is not None: - params['meta'] = utils.url_encode(utils.write_value_as_string(self._meta)) + params['meta'] = utils.write_value_as_string(self._meta) if self._should_store is not None: if self._should_store: @@ -62,6 +62,7 @@ def custom_params(self): else: params["store"] = "0" + # REVIEW: should auth key be assigned here? if self.pubnub.config.auth_key is not None: params["auth"] = utils.url_encode(self.pubnub.config.auth_key) diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index ba5d32a3..036d5356 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -4,7 +4,7 @@ from pubnub.models.consumer.channel_group import PNChannelGroupsAddChannelResult, PNChannelGroupsListResult, \ PNChannelGroupsRemoveChannelResult, PNChannelGroupsRemoveGroupResult from pubnub.pubnub_asyncio import PubNubAsyncio -from tests.helper import pnconf, pnconf_copy +from tests.helper import pnconf, pnconf_copy, pnconf_pam_copy from tests.integrational.vcr_asyncio_sleeper import get_sleeper from tests.integrational.vcr_helper import pn_vcr @@ -133,3 +133,35 @@ def test_add_channel_remove_group(event_loop, sleeper=asyncio.sleep): assert len(env.result.channels) == 0 pubnub.stop() + + +@pytest.mark.asyncio +def test_super_call(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + + ch = "channel-groups-tornado-ch" + gr = "channel-groups-tornado-cg" + + # add + env = yield from pubnub.add_channel_to_channel_group() \ + .channels(ch).channel_group(gr).future() + + assert isinstance(env.result, PNChannelGroupsAddChannelResult) + + # list + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + + # remove channel + env = yield from pubnub.remove_channel_from_channel_group().channel_group(gr).channels(ch).future() + assert isinstance(env.result, PNChannelGroupsRemoveChannelResult) + + # remove group + env = yield from pubnub.remove_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsRemoveGroupResult) + + # list + env = yield from pubnub.list_channels_in_channel_group().channel_group(gr).future() + assert isinstance(env.result, PNChannelGroupsListResult) + + pubnub.stop() diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index b334d049..f83b9ccf 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -1,8 +1,9 @@ import asyncio import pytest +from pubnub.models.consumer.presence import PNHereNowResult from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener -from tests.helper import pnconf_sub_copy +from tests.helper import pnconf_sub_copy, pnconf_pam_copy from tests.integrational.vcr_asyncio_sleeper import get_sleeper from tests.integrational.vcr_helper import pn_vcr @@ -120,3 +121,23 @@ def test_global(event_loop, sleeper=asyncio.sleep): yield from callback.wait_for_disconnect() pubnub.stop() + + +@pytest.mark.asyncio +def test_here_now_super_call(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pubnub.config.uuid = 'test-here-now-asyncio-uuid1' + + env = yield from pubnub.here_now().future() + assert isinstance(env.result, PNHereNowResult) + + env = yield from pubnub.here_now().channel_groups("gr").include_uuids(True).include_state(True).future() + assert isinstance(env.result, PNHereNowResult) + + env = yield from pubnub.here_now().channels('ch.bar*').channel_groups("gr.k").future() + assert isinstance(env.result, PNHereNowResult) + + env = yield from pubnub.here_now().channels(['ch.bar*', 'ch2']).channel_groups("gr.k").future() + assert isinstance(env.result, PNHereNowResult) + + pubnub.stop() \ No newline at end of file diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index 312ab3d2..fce23907 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -236,7 +236,21 @@ def test_error_invalid_key(event_loop): filter_query_parameters=['uuid', 'seqn', 'signature', 'timestamp']) @pytest.mark.asyncio def test_not_permitted(event_loop): - pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + pnconf = pnconf_pam_copy() + pnconf.secret_key = None + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) yield from assert_server_side_error_yield(pubnub.publish().channel(ch).message("hey"), "HTTP Client Error (403") pubnub.stop() + + +@pytest.mark.asyncio +def test_publish_super_admin_call(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + + yield from pubnub.publish().channel(ch).message("hey").future() + yield from pubnub.publish().channel("foo.bar").message("hey^&#$").should_store(True).meta({ + 'name': 'alex' + }).future() + + pubnub.stop() diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index 1ff903ec..ea3b6f3a 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -1,8 +1,9 @@ import asyncio import pytest +from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener -from tests.helper import pnconf, pnconf_copy, pnconf_sub_copy +from tests.helper import pnconf, pnconf_copy, pnconf_sub_copy, pnconf_pam_copy from tests.integrational.vcr_asyncio_sleeper import get_sleeper from tests.integrational.vcr_helper import pn_vcr @@ -108,3 +109,26 @@ def test_multiple_channels(event_loop): assert env.result.channels[ch2]['count'] == 5 pubnub.stop() + + +@pytest.mark.asyncio +def test_state_super_admin_call(event_loop): + pnconf = pnconf_pam_copy() + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + ch1 = 'test-state-asyncio-ch1' + ch2 = 'test-state-asyncio-ch2' + pubnub.config.uuid = 'test-state-asyncio-uuid' + state = {"name": "Alex", "count": 5} + + env = yield from pubnub.set_state() \ + .channels([ch1, ch2]) \ + .state(state) \ + .future() + assert isinstance(env.result, PNSetStateResult) + + env = yield from pubnub.get_state() \ + .channels([ch1, ch2]) \ + .future() + assert isinstance(env.result, PNGetStateResult) + + pubnub.stop() diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index 542ccf0b..5adc5a8a 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -1,8 +1,9 @@ import asyncio import pytest +from pubnub.models.consumer.presence import PNWhereNowResult from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener -from tests.helper import pnconf_sub_copy +from tests.helper import pnconf_sub_copy, pnconf_pam_copy from tests.integrational.vcr_asyncio_sleeper import get_sleeper from tests.integrational.vcr_helper import pn_vcr @@ -81,3 +82,18 @@ def test_multiple_channels(event_loop, sleeper=asyncio.sleep): yield from callback.wait_for_disconnect() pubnub.stop() + + +@pytest.mark.asyncio +def test_where_now_super_admin_call(event_loop): + pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) + + uuid = 'test-where-now-asyncio-uuid' + pubnub.config.uuid = uuid + + env = yield from pubnub.where_now() \ + .uuid(uuid) \ + .future() + assert isinstance(env.result, PNWhereNowResult) + + pubnub.stop() diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 6c6c7e4e..5c997eb3 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -1,16 +1,16 @@ import logging import time import unittest - +import pubnub import pytest -from pubnub.exceptions import PubNubException -import pubnub +from pubnub.exceptions import PubNubException from pubnub.models.consumer.history import PNHistoryResult from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pubnub import PubNub from tests.helper import pnconf_copy, pnconf_enc_copy, pnconf_pam_copy from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep_native +from unittest.mock import patch pubnub.set_stream_logger('pubnub', logging.DEBUG) @@ -81,3 +81,23 @@ def test_not_permitted(self): with pytest.raises(PubNubException): pubnub.history().channel(ch).count(5).sync() + + def test_super_call_with_channel_only(self): + ch = "history-native-sync-ch" + pubnub = PubNub(pnconf_pam_copy()) + pubnub.config.uuid = "history-native-sync-uuid" + + envelope = pubnub.history().channel(ch).sync() + assert isinstance(envelope.result, PNHistoryResult) + + assert not envelope.status.is_error() + + def test_super_call_with_all_params(self): + ch = "history-native-sync-ch" + pubnub = PubNub(pnconf_pam_copy()) + pubnub.config.uuid = "history-native-sync-uuid" + + envelope = pubnub.history().channel(ch).count(2).include_timetoken(True).reverse(True).start(1).end(2).sync() + assert isinstance(envelope.result, PNHistoryResult) + + assert not envelope.status.is_error() From 8cdfcbdafe6d1d6d34e7cfe076a3f7d747f080eb Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 30 Oct 2016 13:54:54 -0700 Subject: [PATCH 386/468] Fix here_now parsing case --- pubnub/models/consumer/presence.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index fc634554..55c981dc 100644 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -24,12 +24,18 @@ def from_json(cls, envelope, channel_names): total_channels=int(json_input['total_channels']), total_occupancy=int(json_input['total_occupancy']), channels=channels) - else: + elif len(channel_names) == 1: return PNHereNowResult( total_channels=int(1), total_occupancy=int(json_input['total_occupancy']), channels=[PNHereNowChannelData(channel_names[0], 0, [])] ) + else: + return PNHereNowResult( + total_channels=int(json_input['total_channels']), + total_occupancy=int(json_input['total_occupancy']), + channels={} + ) # empty elif 'occupancy' in envelope and int(envelope['occupancy']) == 0: return PNHereNowResult( From 445b5800197076497bc8af28001f11d2d7c6cf6c Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 30 Oct 2016 14:10:49 -0700 Subject: [PATCH 387/468] Fix codestyle validation errors --- examples/twisted/basic_usage.py | 4 ++-- tests/integrational/asyncio/test_here_now.py | 2 +- tests/integrational/native_sync/test_history.py | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/examples/twisted/basic_usage.py b/examples/twisted/basic_usage.py index 8694d685..61fdcb71 100644 --- a/examples/twisted/basic_usage.py +++ b/examples/twisted/basic_usage.py @@ -15,7 +15,7 @@ def main(): def my_publish_callback(result, status): # Check whether request successfully completed or not if not status.is_error(): - envelope = result + envelope = result # NOQA:W292 pass # Message successfully published to specified channel. else: pass # Handle message publish error. Check 'category' property to find out possible issue @@ -58,4 +58,4 @@ def message(self, pubnub, message): if __name__ == '__main__': - main() \ No newline at end of file + main() diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index f83b9ccf..a03757f0 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -140,4 +140,4 @@ def test_here_now_super_call(event_loop): env = yield from pubnub.here_now().channels(['ch.bar*', 'ch2']).channel_groups("gr.k").future() assert isinstance(env.result, PNHereNowResult) - pubnub.stop() \ No newline at end of file + pubnub.stop() diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 5c997eb3..3062b6d4 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -10,7 +10,6 @@ from pubnub.pubnub import PubNub from tests.helper import pnconf_copy, pnconf_enc_copy, pnconf_pam_copy from tests.integrational.vcr_helper import use_cassette_and_stub_time_sleep_native -from unittest.mock import patch pubnub.set_stream_logger('pubnub', logging.DEBUG) From aeec9fa9090051b9a30997dc90cbdfde16a741b5 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 30 Oct 2016 14:45:28 -0700 Subject: [PATCH 388/468] Fix functional tests --- tests/functional/test_here_now.py | 4 ++-- tests/functional/test_publish.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/functional/test_here_now.py b/tests/functional/test_here_now.py index 59b2d0a6..3cb628be 100644 --- a/tests/functional/test_here_now.py +++ b/tests/functional/test_here_now.py @@ -39,7 +39,7 @@ def test_here_now_groups(self): % (pnconf.subscribe_key, ",")) self.assertEqual(self.here_now.build_params_callback()({}), { - 'channel-groups': 'gr1', + 'channel-group': 'gr1', 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid }) @@ -51,7 +51,7 @@ def test_here_now_with_options(self): % (pnconf.subscribe_key, "ch1")) self.assertEqual(self.here_now.build_params_callback()({}), { - 'channel-groups': 'gr1', + 'channel-group': 'gr1', 'state': '1', 'disable_uuids': '1', 'pnsdk': sdk_name, diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index e6c4845f..b95860d9 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -72,7 +72,7 @@ def test_pub_with_meta(self): self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'meta': '%5B%22m1%22%2C%20%22m2%22%5D', + 'meta': '["m1", "m2"]', }) def test_pub_store(self): From 18d4632930897865100be638ca88cdc90d6fae35 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 31 Oct 2016 14:06:14 -0700 Subject: [PATCH 389/468] remove support for python 3.2 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 48b3e64f..ad005a0a 100755 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,6 @@ addons: python: - '2.6' - '2.7' - - '3.2' - '3.3' - '3.4' - '3.5' From d7d4cb1f2ad57d6cfe5f0e5c382aca82198509ef Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 31 Oct 2016 14:30:05 -0700 Subject: [PATCH 390/468] 3.9.0 --- .pubnub.yml | 11 +++++++++-- CHANGELOG.md | 14 ++++++++++++++ VERSION | 1 - pubnub.py | 4 ++-- setup.py | 2 +- 5 files changed, 26 insertions(+), 6 deletions(-) delete mode 100644 VERSION diff --git a/.pubnub.yml b/.pubnub.yml index 8d4d653b..07b48c35 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,15 +1,22 @@ name: python -version: 3.8.3 +version: 3.9.0 schema: 1 scm: github.com/pubnub/python changelog: + - version: v3.9.0 + date: + changes: + - type: improvement + text: Dropping support for python 3.2, cascading from requests. + - type: improvement + text: Adding super-admin mode, allowing the server to perform auth restricted operations without self-grant - version: v3.8.3 date: changes: - type: improvement text: Removing PubNub connection handling from using the global directive to allow multiple instances to run. - version: v3.8.2 - date: + date: changes: - type: improvement text: Increasing maximum pool of connections and adjusting cryptodome package dependency. diff --git a/CHANGELOG.md b/CHANGELOG.md index af5c7156..5b28e577 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,18 @@ +## [v3.9.0](https://github.com/pubnub/python/tree/v3.9.0) + + + [Full Changelog](https://github.com/pubnub/python/compare/v3.8.3...v3.9.0) + + +- ⭐Dropping support for python 3.2, cascading from requests. + + + +- ⭐Adding super-admin mode, allowing the server to perform auth restricted operations without self-grant + + + ## [v3.8.3](https://github.com/pubnub/python/tree/v3.8.3) diff --git a/VERSION b/VERSION deleted file mode 100644 index dcd32c18..00000000 --- a/VERSION +++ /dev/null @@ -1 +0,0 @@ -3.8.3 \ No newline at end of file diff --git a/pubnub.py b/pubnub.py index beb5e713..5fad3cdf 100755 --- a/pubnub.py +++ b/pubnub.py @@ -6,7 +6,7 @@ # http://www.pubnub.com/ # ----------------------------------- -# PubNub 3.8.3 Real-time Push Cloud API +# PubNub 3.9.0 Real-time Push Cloud API # ----------------------------------- @@ -304,7 +304,7 @@ def __init__( """ self.origin = origin - self.version = '3.8.3' + self.version = '3.9.0' self.limit = 1800 self.publish_key = publish_key self.subscribe_key = subscribe_key diff --git a/setup.py b/setup.py index dbb9d76a..2399277e 100755 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='3.8.3', + version='3.9.0', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From fd65feb362c3e534e2e51139a06642589ccd8a66 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 2 Nov 2016 17:16:19 -0700 Subject: [PATCH 391/468] update docs --- README.md | 9 +++------ setup.py | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 42125bcf..c0a45290 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # PubNub Python SDK (V4) - -`TODO: update branch reference` -[![Build Status](https://travis-ci.org/pubnub/python.svg?branch=edge)](https://travis-ci.org/pubnub/python) -[![codecov](https://codecov.io/gh/pubnub/python/branch/edge/graph/badge.svg)](https://codecov.io/gh/pubnub/python) +[![Build Status](https://travis-ci.org/pubnub/python.svg?branch=master)](https://travis-ci.org/pubnub/python) +[![codecov](https://codecov.io/gh/pubnub/python/branch/master/graph/badge.svg)](https://codecov.io/gh/pubnub/python) [![PyPI](https://img.shields.io/pypi/v/pubnub.svg)](https://pypi.python.org/pypi/pubnub/) [![PyPI](https://img.shields.io/pypi/pyversions/pubnub.svg?maxAge=2592000)](https://pypi.python.org/pypi/pubnub/) [![Docs](https://img.shields.io/badge/docs-online-blue.svg)](https://www.pubnub.com/docs/python/pubnub-python-sdk) @@ -10,8 +8,7 @@ The SDK supports Python 2.6, 2.7, 3.3, 3.4, 3.5 and pypy. ### Looking for Python V3 SDK? -`TODO: update branch reference` -please use the [master_3x](https://github.com/pubnub/python/tree/master) branch +please use the [master_3x](https://github.com/pubnub/python/tree/master_3x) branch ## Communication diff --git a/setup.py b/setup.py index b8d85ca2..44082d58 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.0.beta2', + version='4.0.0', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 45fc3fb253974230e992e88e3fd4fad35fcac15f Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 16:39:31 -0700 Subject: [PATCH 392/468] bump in twisted deps --- requirements-dev.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements-dev.txt b/requirements-dev.txt index cbf5ed15..b204856d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -3,4 +3,5 @@ pytest-cov codecov pycryptodomex pytest-benchmark +twisted -e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy From 6a6d7cead6442d4ce6c78281fa2b3f2691d0bc9b Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 16:43:41 -0700 Subject: [PATCH 393/468] add further fixes for twisted --- requirements-dev.txt | 1 + scripts/run-tests.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b204856d..68767880 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,4 +4,5 @@ codecov pycryptodomex pytest-benchmark twisted +urlparse -e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 27756356..2dfd75f4 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -27,7 +27,7 @@ def run(command): if version.startswith('2.6'): run( - '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 + '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 elif version.startswith('2.7') or version.startswith('anaconda2'): run("%s,*asyncio*,*python_v35*,examples/" % fcmn) run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) From b3e17ba744d5aa200360018aa4a7bfa9b1127ea9 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 17:01:14 -0700 Subject: [PATCH 394/468] start ignoring twisted tests on ci --- requirements-dev.txt | 1 - scripts/run-tests.py | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 68767880..b204856d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,5 +4,4 @@ codecov pycryptodomex pytest-benchmark twisted -urlparse -e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 2dfd75f4..cc17c23b 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -30,13 +30,13 @@ def run(command): '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 elif version.startswith('2.7') or version.startswith('anaconda2'): run("%s,*asyncio*,*python_v35*,examples/" % fcmn) - run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) + run('%s --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.3'): run("%s,*asyncio*,*python_v35*" % fcmn) - run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) + run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.4'): run("%s,*python_v35*,examples" % fcmn) - run('%s--ignore=tests/integrational/python_v35/ ' % tcmn) + run('%s--ignore=tests/integrational/python_v35/ --ignore=tests/integrational/twisted/ ' % tcmn) elif version.startswith('3.5'): run(fcmn) run(tcmn) @@ -45,6 +45,6 @@ def run(command): run(tcmn) elif version.startswith('pypy'): run("%s,*asyncio*,*python_v35*,examples" % fcmn) - run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) + run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/python_v35/' % tcmn) else: raise Exception("Version %s is not supported by this script runner" % version) From 1f0b32ddeea7a941040b04a34a6b10783bdb9a8b Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 17:04:33 -0700 Subject: [PATCH 395/468] ignore scripts for pep --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index cc17c23b..7d123be2 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -15,7 +15,7 @@ travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) tcmn = 'py.test tests --cov-report=xml --cov=./pubnub ' -fcmn = 'flake8 --exclude=src/,.cache,.git,.idea,.tox,._trial_temp/' +fcmn = 'flake8 --exclude=scripts/,src/,.cache,.git,.idea,.tox,._trial_temp/' print("Version is", version) From eeafd4d0f580788ac5f2f992a3165b5dd4401272 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 18:42:01 -0700 Subject: [PATCH 396/468] fix up test running --- requirements-dev.txt | 2 +- scripts/run-tests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index b204856d..22d465cb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,4 +4,4 @@ codecov pycryptodomex pytest-benchmark twisted --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 7d123be2..e1579fcb 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -39,10 +39,10 @@ def run(command): run('%s--ignore=tests/integrational/python_v35/ --ignore=tests/integrational/twisted/ ' % tcmn) elif version.startswith('3.5'): run(fcmn) - run(tcmn) + run('%s--ignore=tests/integrational/twisted/' % tcmn) elif version.startswith('3.6') or version == 'nightly': run(fcmn) - run(tcmn) + run('%s--ignore=tests/integrational/twisted/' % tcmn) elif version.startswith('pypy'): run("%s,*asyncio*,*python_v35*,examples" % fcmn) run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/python_v35/' % tcmn) From 1ca1edda4ec52aec71c2692310ecd1537ca33862 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 18:45:03 -0700 Subject: [PATCH 397/468] update references --- requirements26-dev.txt | 2 +- requirements27-dev.txt | 2 +- requirements33-dev.txt | 2 +- requirements34-dev.txt | 2 +- requirements35-dev.txt | 2 +- requirements36-dev.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements26-dev.txt b/requirements26-dev.txt index 6679e830..256938cd 100644 --- a/requirements26-dev.txt +++ b/requirements26-dev.txt @@ -1,2 +1,2 @@ mock==2.0.0 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements27-dev.txt b/requirements27-dev.txt index 416c62aa..cdaefb11 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,4 +1,4 @@ tornado pyopenssl flake8 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements33-dev.txt b/requirements33-dev.txt index e23b8c80..c33e50a3 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,3 +1,3 @@ tornado flake8 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements34-dev.txt b/requirements34-dev.txt index 8730cb89..b61be502 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -2,4 +2,4 @@ pytest-asyncio tornado aiohttp flake8 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements35-dev.txt b/requirements35-dev.txt index 8730cb89..b61be502 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -2,4 +2,4 @@ pytest-asyncio tornado aiohttp flake8 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file diff --git a/requirements36-dev.txt b/requirements36-dev.txt index 8730cb89..b61be502 100644 --- a/requirements36-dev.txt +++ b/requirements36-dev.txt @@ -2,4 +2,4 @@ pytest-asyncio tornado aiohttp flake8 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +-e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file From 026ab662d8ba90dafb8a8d2bc5e9d5611b2971e6 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 18:50:25 -0700 Subject: [PATCH 398/468] ignore asyncio tests --- requirements-pypy-dev.txt | 3 +-- requirements26-dev.txt | 3 +-- requirements27-dev.txt | 3 +-- requirements33-dev.txt | 3 +-- requirements34-dev.txt | 3 +-- requirements35-dev.txt | 3 +-- requirements36-dev.txt | 3 +-- scripts/run-tests.py | 4 ++-- 8 files changed, 9 insertions(+), 16 deletions(-) diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt index e23b8c80..06923dc1 100644 --- a/requirements-pypy-dev.txt +++ b/requirements-pypy-dev.txt @@ -1,3 +1,2 @@ tornado -flake8 --e git://github.com/blazeroot/vcrpy@twisted#egg=vcrpy \ No newline at end of file +flake8 \ No newline at end of file diff --git a/requirements26-dev.txt b/requirements26-dev.txt index 256938cd..6eb6461c 100644 --- a/requirements26-dev.txt +++ b/requirements26-dev.txt @@ -1,2 +1 @@ -mock==2.0.0 --e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file +mock==2.0.0 \ No newline at end of file diff --git a/requirements27-dev.txt b/requirements27-dev.txt index cdaefb11..38fc4d1b 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,4 +1,3 @@ tornado pyopenssl -flake8 --e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file +flake8 \ No newline at end of file diff --git a/requirements33-dev.txt b/requirements33-dev.txt index c33e50a3..06923dc1 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,3 +1,2 @@ tornado -flake8 --e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file +flake8 \ No newline at end of file diff --git a/requirements34-dev.txt b/requirements34-dev.txt index b61be502..b497f456 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -1,5 +1,4 @@ pytest-asyncio tornado aiohttp -flake8 --e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file +flake8 \ No newline at end of file diff --git a/requirements35-dev.txt b/requirements35-dev.txt index b61be502..b497f456 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -1,5 +1,4 @@ pytest-asyncio tornado aiohttp -flake8 --e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file +flake8 \ No newline at end of file diff --git a/requirements36-dev.txt b/requirements36-dev.txt index b61be502..b497f456 100644 --- a/requirements36-dev.txt +++ b/requirements36-dev.txt @@ -1,5 +1,4 @@ pytest-asyncio tornado aiohttp -flake8 --e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy \ No newline at end of file +flake8 \ No newline at end of file diff --git a/scripts/run-tests.py b/scripts/run-tests.py index e1579fcb..3514d4ca 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -39,10 +39,10 @@ def run(command): run('%s--ignore=tests/integrational/python_v35/ --ignore=tests/integrational/twisted/ ' % tcmn) elif version.startswith('3.5'): run(fcmn) - run('%s--ignore=tests/integrational/twisted/' % tcmn) + run('%s--ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/' % tcmn) elif version.startswith('3.6') or version == 'nightly': run(fcmn) - run('%s--ignore=tests/integrational/twisted/' % tcmn) + run('%s--ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/' % tcmn) elif version.startswith('pypy'): run("%s,*asyncio*,*python_v35*,examples" % fcmn) run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/python_v35/' % tcmn) From 390fc4b27354cea1bb86999e42aefe9cd8be3ce9 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 4 Nov 2016 18:53:25 -0700 Subject: [PATCH 399/468] ignore asyncio tests --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 3514d4ca..de960d4b 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -36,7 +36,7 @@ def run(command): run('%s--ignore=tests/integrational/asyncio/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/python_v35/' % tcmn) elif version.startswith('3.4'): run("%s,*python_v35*,examples" % fcmn) - run('%s--ignore=tests/integrational/python_v35/ --ignore=tests/integrational/twisted/ ' % tcmn) + run('%s--ignore=tests/integrational/python_v35/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/' % tcmn) elif version.startswith('3.5'): run(fcmn) run('%s--ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/' % tcmn) From b5de927d82265a210c71e7b3e0eea7b22f9906eb Mon Sep 17 00:00:00 2001 From: Max Presman Date: Sun, 6 Nov 2016 20:37:43 -0800 Subject: [PATCH 400/468] Update README.md --- README.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c0a45290..63f70ae9 100644 --- a/README.md +++ b/README.md @@ -2,11 +2,16 @@ [![Build Status](https://travis-ci.org/pubnub/python.svg?branch=master)](https://travis-ci.org/pubnub/python) [![codecov](https://codecov.io/gh/pubnub/python/branch/master/graph/badge.svg)](https://codecov.io/gh/pubnub/python) [![PyPI](https://img.shields.io/pypi/v/pubnub.svg)](https://pypi.python.org/pypi/pubnub/) -[![PyPI](https://img.shields.io/pypi/pyversions/pubnub.svg?maxAge=2592000)](https://pypi.python.org/pypi/pubnub/) -[![Docs](https://img.shields.io/badge/docs-online-blue.svg)](https://www.pubnub.com/docs/python/pubnub-python-sdk) +[![PyPI](https://img.shields.io/pypi/pyversions/pubnub.svg)](https://pypi.python.org/pypi/pubnub/) +[![Docs](https://img.shields.io/badge/docs-online-blue.svg)](https://www.pubnub.com/docs/python/pubnub-python-sdk-v4) The SDK supports Python 2.6, 2.7, 3.3, 3.4, 3.5 and pypy. +## Documentation + +Please review our documentation and examples on the [PubNub Website](https://www.pubnub.com/docs/python/pubnub-python-sdk-v4) + + ### Looking for Python V3 SDK? please use the [master_3x](https://github.com/pubnub/python/tree/master_3x) branch From d8ed225c3c7b1ce2fc2ba735a5b3bb583cd46b31 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 14:21:56 -0800 Subject: [PATCH 401/468] 4.0.1 --- .pubnub.yml | 7 ++++++- CHANGELOG.md | 10 ++++++++++ pubnub/pubnub_core.py | 2 +- setup.py | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 026c72d6..2112af22 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.0 +version: 4.0.1 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.1 + date: + changes: + - type: improvement + text: Fixing up packaging configuration for py3 - version: v4.0.0 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7034d96c..f51428f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +## [v4.0.1](https://github.com/pubnub/python/tree/v4.0.1) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.0...v4.0.1) + + +- ⭐Fixing up packaging configuration for py3 + + + ## [v4.0.0](https://github.com/pubnub/python/tree/v4.0.0) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 3a779452..c8ee5a5c 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.0" + SDK_VERSION = "4.0.1" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index 44082d58..9303d2ae 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,13 @@ -from setuptools import setup +from setuptools import setup,find_packages setup( name='pubnub', - version='4.0.0', + version='4.0.1', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', url='http://pubnub.com', - modules=['pubnub'], + packages=find_packages(), license='MIT', classifiers=( 'Development Status :: 5 - Production/Stable', From ebbbdb5e497f727ceffde759c99f88ed82bf504c Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 14:49:46 -0800 Subject: [PATCH 402/468] update fixtures --- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channels.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 30 +++++----- .../fixtures/asyncio/here_now/global.yaml | 18 +++--- .../asyncio/here_now/multiple_channels.yaml | 18 +++--- .../asyncio/here_now/single_channel.yaml | 18 +++--- .../fixtures/asyncio/pam/global_level.yaml | 18 +++--- .../asyncio/pam/multiple_channel_groups.yaml | 12 ++-- .../multiple_channel_groups_with_auth.yaml | 12 ++-- .../asyncio/pam/multiple_channels.yaml | 12 ++-- .../pam/multiple_channels_with_auth.yaml | 12 ++-- .../asyncio/pam/sign_non_pam_request.yaml | 6 +- .../fixtures/asyncio/pam/single_channel.yaml | 12 ++-- .../asyncio/pam/single_channel_group.yaml | 12 ++-- .../pam/single_channel_group_with_auth.yaml | 12 ++-- .../asyncio/pam/single_channel_with_auth.yaml | 12 ++-- .../asyncio/publish/do_not_store.yaml | 6 +- .../fixtures/asyncio/publish/invalid_key.yaml | 6 +- .../fixtures/asyncio/publish/meta_object.yaml | 6 +- .../asyncio/publish/mixed_via_get.yaml | 24 ++++---- .../publish/mixed_via_get_encrypted.yaml | 24 ++++---- .../asyncio/publish/mixed_via_post.yaml | 24 ++++---- .../publish/mixed_via_post_encrypted.yaml | 24 ++++---- .../asyncio/publish/not_permitted.yaml | 6 +- .../asyncio/publish/object_via_get.yaml | 6 +- .../publish/object_via_get_encrypted.yaml | 6 +- .../asyncio/publish/object_via_post.yaml | 6 +- .../publish/object_via_post_encrypted.yaml | 6 +- .../fixtures/asyncio/secure/ssl.yaml | 6 +- .../asyncio/state/multiple_channel.yaml | 8 +-- .../asyncio/state/single_channel.yaml | 8 +-- .../single_channel_with_subscription.yaml | 48 +++++++-------- .../asyncio/subscription/cg_join_leave.yaml | 54 ++++++++--------- .../subscription/cg_sub_pub_unsub.yaml | 36 +++++------ .../asyncio/subscription/cg_sub_unsub.yaml | 24 ++++---- .../asyncio/subscription/join_leave.yaml | 42 ++++++------- .../asyncio/subscription/sub_pub_unsub.yaml | 24 ++++---- .../subscription/sub_pub_unsub_enc.yaml | 24 ++++---- .../asyncio/subscription/sub_unsub.yaml | 12 ++-- .../asyncio/subscription/unsubscribe_all.yaml | 36 +++++------ .../fixtures/asyncio/time/get.yaml | 6 +- .../asyncio/where_now/multiple_channels.yaml | 18 +++--- .../asyncio/where_now/single_channel.yaml | 18 +++--- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../fixtures/native_sync/history/basic.yaml | 24 ++++---- .../fixtures/native_sync/history/encoded.yaml | 24 ++++---- .../native_sync/history/not_permitted.yaml | 4 +- .../native_sync/publish/invalid_key.yaml | 4 +- .../native_sync/publish/publish_bool_get.yaml | 4 +- .../publish/publish_bool_post.yaml | 4 +- .../publish/publish_do_not_store.yaml | 4 +- .../publish/publish_encrypted_list_get.yaml | 4 +- .../publish/publish_encrypted_list_post.yaml | 4 +- .../publish/publish_encrypted_string_get.yaml | 4 +- .../publish_encrypted_string_post.yaml | 4 +- .../native_sync/publish/publish_int_get.yaml | 4 +- .../native_sync/publish/publish_int_post.yaml | 4 +- .../native_sync/publish/publish_list_get.yaml | 4 +- .../publish/publish_list_post.yaml | 4 +- .../publish/publish_object_get.yaml | 4 +- .../publish/publish_object_post.yaml | 4 +- .../publish/publish_string_get.yaml | 4 +- .../publish/publish_string_post.yaml | 4 +- .../publish/publish_with_meta.yaml | 4 +- .../fixtures/native_sync/ssl/ssl.yaml | 4 +- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channel.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 24 ++++---- .../fixtures/tornado/heartbeat/timeout.yaml | 60 +++++++++---------- .../fixtures/tornado/here_now/global.yaml | 30 +++++----- .../fixtures/tornado/here_now/multiple.yaml | 24 ++++---- .../fixtures/tornado/here_now/single.yaml | 18 +++--- .../tornado/publish/do_not_store.yaml | 12 ++-- .../fixtures/tornado/publish/invalid_key.yaml | 12 ++-- .../fixtures/tornado/publish/meta_object.yaml | 12 ++-- .../tornado/publish/mixed_via_get.yaml | 48 +++++++-------- .../publish/mixed_via_get_encrypted.yaml | 48 +++++++-------- .../tornado/publish/mixed_via_post.yaml | 48 +++++++-------- .../publish/mixed_via_post_encrypted.yaml | 48 +++++++-------- .../tornado/publish/not_permitted.yaml | 12 ++-- .../tornado/publish/object_via_get.yaml | 12 ++-- .../publish/object_via_get_encrypted.yaml | 12 ++-- .../tornado/publish/object_via_post.yaml | 12 ++-- .../publish/object_via_post_encrypted.yaml | 12 ++-- .../tornado/state/multiple_channel.yaml | 12 ++-- .../tornado/state/single_channel.yaml | 12 ++-- .../tornado/subscribe/group_join_leave.yaml | 60 +++++++++---------- .../subscribe/group_sub_pub_unsub.yaml | 36 +++++------ .../tornado/subscribe/group_sub_unsub.yaml | 24 ++++---- .../tornado/subscribe/join_leave.yaml | 48 +++++++-------- .../tornado/subscribe/sub_pub_unsub.yaml | 24 ++++---- .../fixtures/tornado/subscribe/sub_unsub.yaml | 12 ++-- .../subscribe/subscribe_tep_by_step.yaml | 24 ++++---- .../tornado/where_now/multiple_channels.yaml | 30 +++++----- .../tornado/where_now/single_channel.yaml | 18 +++--- .../fixtures/twisted/groups/add_channels.yaml | 8 +-- .../twisted/groups/add_single_channel.yaml | 8 +-- .../twisted/groups/list_channels.yaml | 8 +-- .../twisted/groups/remove_channels.yaml | 8 +-- .../twisted/groups/remove_single_channel.yaml | 8 +-- .../fixtures/twisted/here_now/global.yaml | 8 +-- .../fixtures/twisted/here_now/multiple.yaml | 8 +-- .../fixtures/twisted/here_now/single.yaml | 8 +-- .../twisted/publish/do_not_store.yaml | 8 +-- .../fixtures/twisted/publish/forbidden.yaml | 8 +-- .../fixtures/twisted/publish/invalid_key.yaml | 8 +-- .../fixtures/twisted/publish/meta_object.yaml | 8 +-- .../publish/mixed_encrypted_via_get.yaml | 32 +++++----- .../twisted/publish/mixed_via_get.yaml | 32 +++++----- .../twisted/publish/object_via_get.yaml | 8 +-- .../twisted/state/multiple_channels.yaml | 8 +-- .../twisted/state/single_channel.yaml | 8 +-- .../fixtures/twisted/where_now/multiple.yaml | 8 +-- .../fixtures/twisted/where_now/single.yaml | 8 +-- tests/unit/test_utils.py | 2 +- tests/unit/test_vcr_helper.py | 4 +- 125 files changed, 1005 insertions(+), 1005 deletions(-) diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index 88e53d48..0c074538 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:04 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 1f2b05f8..1b8f8ab6 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index 7b0a95f3..dd056260 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14713558782056075"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -26,13 +26,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", @@ -42,13 +42,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -57,13 +57,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=test-channel-groups-asyncio-ch - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} @@ -72,5 +72,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 751489c5..9164310d 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14714204724402473","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:32 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -29,13 +29,13 @@ interactions: CONTENT-LENGTH: '412', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -44,5 +44,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:38 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 0f48a306..2f235c50 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713594568087822","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -28,13 +28,13 @@ interactions: CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -43,5 +43,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index 32071c48..7beb1b61 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713563292410522","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:29 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index 0385c408..ef28f457 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access Manager","status":200}'} @@ -30,13 +30,13 @@ interactions: CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=0&uuid=my_uuid&w=0 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=0&uuid=my_uuid&w=0 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access Manager","status":200}'} @@ -46,5 +46,5 @@ interactions: CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index 76601240..d4bef722 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index e0692709..0e72f69b 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index 5c765a96..2fdaba86 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index bb60b607..6f130f5a 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '345', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml index 69106255..655a3068 100644 --- a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml +++ b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=my_uuid + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=my_uuid response: body: {string: '{"message":"Forbidden","payload":{"channels":["blah"]},"error":true,"service":"Access Manager","status":403} @@ -16,5 +16,5 @@ interactions: CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 14 Oct 2016 12:51:06 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index b8b481a9..3e3c06cd 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:52 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index fd2bec61..b9d406c6 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index d01966b9..9c289e46 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index 64373e81..fb1478d8 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index 933fd554..f0ee4e89 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&store=0 response: body: {string: '[1,"Sent","14715124518965795"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:27:31 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index 10f82367..4d21308a 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[0,"Invalid Key","14715121286597316"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:22:08 GMT'} status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad + url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index 8ba94236..24b688d7 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715122016841196"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:23:21 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.0&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index 0d54d0ac..18fd4e22 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073577558"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073592350"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073603443"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073604938"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index 5a1dd7eb..565bc12b 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539265931"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539286406"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539293096"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539315353"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index 1d0f60d4..a8b172cd 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -2,53 +2,53 @@ interactions: - request: body: 'true' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007838319"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: '"hi"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007890145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: '5' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007894502"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: '["hi", "hi2", "hi3"]' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007926933"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index 8402c61e..db8c10bf 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500557815"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500599883"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500607388"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500616628"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index 1906b979..e807cacb 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0×tamp=1476628727 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1×tamp=1476628727 response: body: {string: '[1,"Sent","14766287276539619"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 14:38:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index fb8c0a09..df84bf86 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531074414363"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index d08b4800..6c922700 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715102088417575"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:50:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index 8cd1db9b..1ae32c84 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '{"online": true, "name": "Alex"}' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714530475966145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:57:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index a7662618..dc85bf4f 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113905714923"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index 81f2f9c9..5ae60f73 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14714344166454996"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:46:56 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index 318feae3..c662cc5d 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index 726e4f49..0ac32808 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 5e22a814..1f4a36dc 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14724899162046665","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -25,13 +25,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -39,13 +39,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:47 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -53,13 +53,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:52 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:57 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -82,13 +82,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": @@ -98,13 +98,13 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -113,5 +113,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:59:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index e067bc7f..4b9ede5e 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:07 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511480343359","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511480343359 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511480343359 response: body: {string: '{"t":{"t":"14713511489324977","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511488470095","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351148, "uuid": "test-subscribe-asyncio-listener", @@ -41,26 +41,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511480343359 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511480343359 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511488599816","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511489324977 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511489324977 response: body: {string: '{"t":{"t":"14713511498339636","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511497874401","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511489324977 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511489324977 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511498339636 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511498339636 response: body: {string: '{"t":{"t":"14713511502190714","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511499971846","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "leave", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -99,13 +99,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511498339636 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511498339636 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -114,13 +114,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -129,5 +129,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 8ed5049f..fa9e7c3e 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,52 +13,52 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511466073676","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14713511467409673"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511466073676 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511466073676 response: body: {string: '{"t":{"t":"14713511467422512","r":12},"m":[{"a":"2","f":0,"i":"f73c5107-519c-42fd-b1e1-7f9377430082","s":1,"p":{"t":"14713511467409673","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511466073676 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511466073676 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -82,5 +82,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 75858dc4..be7c2557 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511453005433","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,13 +41,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -56,5 +56,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index c11693e2..8c8ffac1 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713498789397698","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511412634058","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511411661104","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-listener", @@ -26,26 +26,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511412354502","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -54,13 +54,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511418815177","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511418422322","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "leave", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -99,5 +99,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 841318f6..8932b8c7 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -2,48 +2,48 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511399140178","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14713511400414851"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511400414851","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '226', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index c4f3048e..59d50077 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -2,48 +2,48 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14713511404390559"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511404397571","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511404390559","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index a297f961..0ce76304 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511396585426","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -26,5 +26,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index 96217de8..de3c6055 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -28,26 +28,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14742262356649203","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:15 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -56,13 +56,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -71,13 +71,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -86,5 +86,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index e572bbc0..9fd2fe03 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[14766398773102530]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 17:44:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=1517d268-4797-4fcb-941c-0f862e61399f + url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=1517d268-4797-4fcb-941c-0f862e61399f version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index 807d96bb..d275b606 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14714362383675346","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:18 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:25 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index ecd5b36f..3f38426a 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14714351489282409","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index ba5f29e7..3cf61491 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index f4e12afb..53fc4356 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 8ca509df..6c8abdd5 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-native-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 9b849fef..3e6add3a 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14694610268707663"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.0&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.1&seqn=2 response: body: {string: '[1,"Sent","14694610269494321"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.0&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.1&seqn=3 response: body: {string: '[1,"Sent","14694610270571781"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.0&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.1&seqn=4 response: body: {string: '[1,"Sent","14694610271664959"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.0&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.1&seqn=5 response: body: {string: '[1,"Sent","14694610272640835"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14694610268707663,14694610272640835]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index e682296f..3959b239 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14695248164027962"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=2 response: body: {string: '[1,"Sent","14695248165146799"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=3 response: body: {string: '[1,"Sent","14695248166152452"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=4 response: body: {string: '[1,"Sent","14695248167059434"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=5 response: body: {string: '[1,"Sent","14695248167891717"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14695248164027962,14695248167891717]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index 7cb51b48..8d619e19 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"message":"Forbidden","payload":{"channels":["history-native-sync-ch"]},"error":true,"service":"Access Manager","status":403} diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index 83436c9f..38bc24a4 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[0,"Invalid Key","14691119692918567"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index 68bbda37..dda888a4 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119695085971"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index a79784ef..c0c4ad3c 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119697248854"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index 0bab5f0e..af27aa23 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1&store=0 response: body: {string: '[1,"Sent","14691119699221362"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index f2882fde..9e45edcc 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119701316179"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index b10528eb..c558a102 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119703765115"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index bcbb7169..3e7d13cd 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119705911160"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index aef35873..51ad43d4 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119708241133"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index 4914f6d1..df85ded4 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119710341756"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index dbd165b7..dd764153 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['1'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119712785973"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index 87d32e29..ea3e79fa 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119714790991"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index d04020ef..c7b7bf68 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['20'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119717175739"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index 2b3ba5f0..7d9f13fc 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691173575177499"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 919da166..86980e7d 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['32'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119720483041"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index aab0c736..41a0cbe7 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14703077680843249"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index 88a9cfc7..a818e25f 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119724317947"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index e3d9e0ab..74748858 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691124461710414"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index 763e07ed..b5e6cae7 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14698699475874207"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index 23da9c5f..d38b4130 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index ee2bf54d..7c545a43 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index 6220ecbd..c25d6a74 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index 1e4f23e0..b3511e04 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index cdf80660..97f71da8 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index b563805b..5e9e9291 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index 1412458f..56cd63ff 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml index 5cbda7e5..03c45d14 100644 --- a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml index 4ba778a8..ba483449 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['187'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml index 50fad114..0c37347d 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=channel-groups-tornado-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml index 39617960..a8b68074 100644 --- a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341188112072 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341188112072 response: body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341195231188 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341195231188 response: body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -176,14 +176,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -218,14 +218,14 @@ interactions: - Age - ['3'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -260,14 +260,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341206425665 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341206425665 response: body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -295,14 +295,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341368999461 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341368999461 response: body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -330,14 +330,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -373,5 +373,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml index dce0193d..c035b905 100644 --- a/tests/integrational/fixtures/tornado/here_now/global.yaml +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -185,5 +185,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml index 783ba762..5e9fdeed 100644 --- a/tests/integrational/fixtures/tornado/here_now/multiple.yaml +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml index 49ebc86b..79daff87 100644 --- a/tests/integrational/fixtures/tornado/here_now/single.yaml +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:34 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-uuid"], "occupancy": 1}'} @@ -74,14 +74,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:38 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:39 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml index 28f597db..e3171c83 100644 --- a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1&store=0 response: body: {string: '[1,"Sent","14707213568554057"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1&store=0 response: body: {string: '[1,"Sent","14707213569308777"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml index ba99c8e0..53851919 100644 --- a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[0,"Invalid Key","14707240653092162"]'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[0,"Invalid Key","14707240653816927"]'} headers: @@ -64,5 +64,5 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml index 51ae15a6..7ea6f4f3 100644 --- a/tests/integrational/fixtures/tornado/publish/meta_object.yaml +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14707233493629583"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14707233494525529"]'} headers: @@ -64,5 +64,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml index 4f5baff9..2e811cc5 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654961878754"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654962988338"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654963998910"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654965094211"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654966264107"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654968497326"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654969624146"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654971058947"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml index 4af74baf..8ab7da35 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654973576283"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654974534808"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654975469383"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654976370725"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654977343057"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654978302189"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654979370691"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654980293520"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml index 143a5c9a..4f6f86d2 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789261217101"]'} headers: @@ -31,14 +31,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789261901583"]'} headers: @@ -64,14 +64,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789262581697"]'} headers: @@ -97,14 +97,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789263258448"]'} headers: @@ -130,14 +130,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789263937508"]'} headers: @@ -163,14 +163,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789264623948"]'} headers: @@ -196,14 +196,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789265622885"]'} headers: @@ -229,14 +229,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789266306131"]'} headers: @@ -262,5 +262,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml index 58a5bba3..1bb89086 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724320847330"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724321905127"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724322939251"]'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724323960752"]'} headers: @@ -130,14 +130,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724325062358"]'} headers: @@ -163,14 +163,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724326150829"]'} headers: @@ -196,14 +196,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724327259504"]'} headers: @@ -229,14 +229,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724328343318"]'} headers: @@ -262,5 +262,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index fbc8fcea..5aab69ac 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -46,14 +46,14 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -94,5 +94,5 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml index 2924352b..afe64fec 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653397219269"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653398506519"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml index 4cf48bc1..cbc489a2 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653400646308"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653401928744"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml index 549532ba..2e1ef559 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706787329216107"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff - request: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706787330184998"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml index 139ec069..b24f86d5 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706781595277610"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.1&seqn=1 - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706781596540558"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.0&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.1&seqn=2 version: 1 diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml index f7581633..0ee92015 100644 --- a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, @@ -85,5 +85,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml index 4fc8147c..d783feee 100644 --- a/tests/integrational/fixtures/tornado/state/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} @@ -84,5 +84,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index 06a3f811..1fa35531 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708460251954075","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460251954075 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460251954075 response: body: {string: '{"t":{"t":"14708460259366919","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460258668827","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846025, "uuid": "test-subscribe-listener", "occupancy": @@ -109,14 +109,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708460259353278","r":3},"m":[]}'} headers: @@ -142,14 +142,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460259366919 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460259366919 response: body: {string: '{"t":{"t":"14708460267928187","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460266713809","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -177,14 +177,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -220,14 +220,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460267928187 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460267928187 response: body: {string: '{"t":{"t":"14708460271883006","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460269981178","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -255,14 +255,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -298,14 +298,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460271883006 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460271883006 response: body: {string: '{"t":{"t":"14708460276100655","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460273860352","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846027, "uuid": "test-subscribe-listener", "occupancy": @@ -333,14 +333,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-test-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-test-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -376,5 +376,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index 2acdcd27..59e57ce9 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708450055747125","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14708450057626682"]'} headers: @@ -107,14 +107,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708450055747125 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708450055747125 response: body: {string: '{"t":{"t":"14708450057612306","r":3},"m":[{"a":"2","f":0,"i":"881d453a-4ef5-4dc3-a5a5-be11147ae030","s":1,"p":{"t":"14708450057626682","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} headers: @@ -140,14 +140,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,14 +183,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -226,5 +226,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index 030a8309..31aafd8a 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708447464037454","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,14 +117,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -160,5 +160,5 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index e0cb6054..e08de460 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708438179383195","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:48 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&uuid=subscribe-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708438179383195 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708438179383195 response: body: {string: '{"t":{"t":"14708443090824007","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443089669538","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844308, "uuid": "subscribe-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708443090868294","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443090824007 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443090824007 response: body: {string: '{"t":{"t":"14708443098649253","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443097146633","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844309, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443098649253 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443098649253 response: body: {string: '{"t":{"t":"14708443101375638","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443100579978","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -169,14 +169,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -212,14 +212,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443101375638 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443101375638 response: body: {string: '{"t":{"t":"14708443105516188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443104721390","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-listener", "occupancy": @@ -247,14 +247,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -290,5 +290,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=subscribe-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index adc6be5f..4a98d68f 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708323099136684","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14708323101133727"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708323099136684 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708323099136684 response: body: {string: '{"t":{"t":"14708323101140128","r":3},"m":[{"a":"2","f":0,"i":"970e123c-d9a0-45b8-b885-3dae1011bf03","s":1,"p":{"t":"14708323101133727","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708323099136684&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708323099136684&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -140,5 +140,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index 6b395941..0a81d13c 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708323101261227","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index 2f0ca094..2b4ed761 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717806990508559","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:19 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717807001063591","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:20 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml index 6a63913d..0ec266a2 100644 --- a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", "where-now-tornado-ch1"]}, "service": "Presence"}'} @@ -140,14 +140,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,5 +183,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml index 1d74a1bf..b4f75974 100644 --- a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, "service": "Presence"}'} @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml index e4322a71..10361bff 100644 --- a/tests/integrational/fixtures/twisted/groups/add_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml index 278b8c51..3248b6a0 100644 --- a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml index efd8e6ff..0331cf65 100644 --- a/tests/integrational/fixtures/twisted/groups/list_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml index 68bd163b..ebe6d670 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&remove=cgttc0%2Ccgttc1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&remove=cgttc0%2Ccgttc1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml index 320e5c63..862777a4 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&remove=cgttc + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&remove=cgttc response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml index a248c0c3..015d1fc2 100644 --- a/tests/integrational/fixtures/twisted/here_now/global.yaml +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -12,7 +12,7 @@ interactions: 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml index d6d97d50..bdc94e72 100644 --- a/tests/integrational/fixtures/twisted/here_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -2,16 +2,16 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}}, "total_channels": 1, "total_occupancy": 1}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml index b8a7994a..09aff84c 100644 --- a/tests/integrational/fixtures/twisted/here_now/single.yaml +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml index 680e1687..9c793223 100644 --- a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&store=0 response: body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index b3def76f..03ee7492 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -12,7 +12,7 @@ interactions: '} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 403, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.0&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.1&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml index fd221291..d0bec05c 100644 --- a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 400, message: ''} - url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 + url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml index 64df534b..6d3d293e 100644 --- a/tests/integrational/fixtures/twisted/publish/meta_object.yaml +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml index d9dbcfe3..ce98a9ed 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml index a02c17c9..0f971b4d 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml index 5a3ef940..da990669 100644 --- a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml index 01522eb6..ae8d45f3 100644 --- a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.0&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.1&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml index 94c57187..891cb64d 100644 --- a/tests/integrational/fixtures/twisted/state/single_channel.yaml +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.0&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.1&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml index 05169d2b..6137bb5c 100644 --- a/tests/integrational/fixtures/twisted/where_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml index c07440df..d2f04e44 100644 --- a/tests/integrational/fixtures/twisted/where_now/single.yaml +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f version: 1 diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 2a94d3e8..4552f417 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -72,7 +72,7 @@ def test_sign_sha_256(self): input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 grant -channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.0&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.1&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) assert "Dq92jnwRTCikdeP2nUs1__gyJthF8NChwbs5aYy2r_I=" == result diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index eab52ae9..29310263 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -26,10 +26,10 @@ def test_string_list_in_path_matcher(self): def test_string_list_in_path_query_matcher(self): r1 = Request( - query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), + query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.1'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) r2 = Request( - query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), + query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.1'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) assert string_list_in_query_matcher(r1, r2, ['channel']) From 1e79597ad16aa142760c8eb12e57fbe93a7ff4fd Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 15:03:17 -0800 Subject: [PATCH 403/468] fix up linting --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9303d2ae..0b28a79e 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup,find_packages +from setuptools import setup, find_packages setup( name='pubnub', From 043068622de34c26ea2ed6ac2061144a3b84df06 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 15:17:30 -0800 Subject: [PATCH 404/468] adjust signature --- tests/unit/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 4552f417..f3bb5ce9 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -75,4 +75,4 @@ def test_sign_sha_256(self): channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.1&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) - assert "Dq92jnwRTCikdeP2nUs1__gyJthF8NChwbs5aYy2r_I=" == result + assert "3P7WMijA_gF3mVRq4hUxmzmAl3sm4d_Hgpz2gQW9NrY=" == result From d2112c18acb25df2c00f9a3f2198a69f3efae04a Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 14:21:56 -0800 Subject: [PATCH 405/468] 4.0.1 --- .pubnub.yml | 7 ++++++- CHANGELOG.md | 10 ++++++++++ pubnub/pubnub_core.py | 2 +- setup.py | 6 +++--- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 026c72d6..2112af22 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.0 +version: 4.0.1 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.1 + date: + changes: + - type: improvement + text: Fixing up packaging configuration for py3 - version: v4.0.0 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 7034d96c..f51428f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +## [v4.0.1](https://github.com/pubnub/python/tree/v4.0.1) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.0...v4.0.1) + + +- ⭐Fixing up packaging configuration for py3 + + + ## [v4.0.0](https://github.com/pubnub/python/tree/v4.0.0) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 3a779452..c8ee5a5c 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.0" + SDK_VERSION = "4.0.1" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index 44082d58..9303d2ae 100644 --- a/setup.py +++ b/setup.py @@ -1,13 +1,13 @@ -from setuptools import setup +from setuptools import setup,find_packages setup( name='pubnub', - version='4.0.0', + version='4.0.1', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', url='http://pubnub.com', - modules=['pubnub'], + packages=find_packages(), license='MIT', classifiers=( 'Development Status :: 5 - Production/Stable', From 56d992b9fff8099245da8ff58aadeb735a0affb3 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 14:49:46 -0800 Subject: [PATCH 406/468] update fixtures --- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channels.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 30 +++++----- .../fixtures/asyncio/here_now/global.yaml | 18 +++--- .../asyncio/here_now/multiple_channels.yaml | 18 +++--- .../asyncio/here_now/single_channel.yaml | 18 +++--- .../fixtures/asyncio/pam/global_level.yaml | 18 +++--- .../asyncio/pam/multiple_channel_groups.yaml | 12 ++-- .../multiple_channel_groups_with_auth.yaml | 12 ++-- .../asyncio/pam/multiple_channels.yaml | 12 ++-- .../pam/multiple_channels_with_auth.yaml | 12 ++-- .../asyncio/pam/sign_non_pam_request.yaml | 6 +- .../fixtures/asyncio/pam/single_channel.yaml | 12 ++-- .../asyncio/pam/single_channel_group.yaml | 12 ++-- .../pam/single_channel_group_with_auth.yaml | 12 ++-- .../asyncio/pam/single_channel_with_auth.yaml | 12 ++-- .../asyncio/publish/do_not_store.yaml | 6 +- .../fixtures/asyncio/publish/invalid_key.yaml | 6 +- .../fixtures/asyncio/publish/meta_object.yaml | 6 +- .../asyncio/publish/mixed_via_get.yaml | 24 ++++---- .../publish/mixed_via_get_encrypted.yaml | 24 ++++---- .../asyncio/publish/mixed_via_post.yaml | 24 ++++---- .../publish/mixed_via_post_encrypted.yaml | 24 ++++---- .../asyncio/publish/not_permitted.yaml | 6 +- .../asyncio/publish/object_via_get.yaml | 6 +- .../publish/object_via_get_encrypted.yaml | 6 +- .../asyncio/publish/object_via_post.yaml | 6 +- .../publish/object_via_post_encrypted.yaml | 6 +- .../fixtures/asyncio/secure/ssl.yaml | 6 +- .../asyncio/state/multiple_channel.yaml | 8 +-- .../asyncio/state/single_channel.yaml | 8 +-- .../single_channel_with_subscription.yaml | 48 +++++++-------- .../asyncio/subscription/cg_join_leave.yaml | 54 ++++++++--------- .../subscription/cg_sub_pub_unsub.yaml | 36 +++++------ .../asyncio/subscription/cg_sub_unsub.yaml | 24 ++++---- .../asyncio/subscription/join_leave.yaml | 42 ++++++------- .../asyncio/subscription/sub_pub_unsub.yaml | 24 ++++---- .../subscription/sub_pub_unsub_enc.yaml | 24 ++++---- .../asyncio/subscription/sub_unsub.yaml | 12 ++-- .../asyncio/subscription/unsubscribe_all.yaml | 36 +++++------ .../fixtures/asyncio/time/get.yaml | 6 +- .../asyncio/where_now/multiple_channels.yaml | 18 +++--- .../asyncio/where_now/single_channel.yaml | 18 +++--- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../fixtures/native_sync/history/basic.yaml | 24 ++++---- .../fixtures/native_sync/history/encoded.yaml | 24 ++++---- .../native_sync/history/not_permitted.yaml | 4 +- .../native_sync/publish/invalid_key.yaml | 4 +- .../native_sync/publish/publish_bool_get.yaml | 4 +- .../publish/publish_bool_post.yaml | 4 +- .../publish/publish_do_not_store.yaml | 4 +- .../publish/publish_encrypted_list_get.yaml | 4 +- .../publish/publish_encrypted_list_post.yaml | 4 +- .../publish/publish_encrypted_string_get.yaml | 4 +- .../publish_encrypted_string_post.yaml | 4 +- .../native_sync/publish/publish_int_get.yaml | 4 +- .../native_sync/publish/publish_int_post.yaml | 4 +- .../native_sync/publish/publish_list_get.yaml | 4 +- .../publish/publish_list_post.yaml | 4 +- .../publish/publish_object_get.yaml | 4 +- .../publish/publish_object_post.yaml | 4 +- .../publish/publish_string_get.yaml | 4 +- .../publish/publish_string_post.yaml | 4 +- .../publish/publish_with_meta.yaml | 4 +- .../fixtures/native_sync/ssl/ssl.yaml | 4 +- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channel.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 24 ++++---- .../fixtures/tornado/heartbeat/timeout.yaml | 60 +++++++++---------- .../fixtures/tornado/here_now/global.yaml | 30 +++++----- .../fixtures/tornado/here_now/multiple.yaml | 24 ++++---- .../fixtures/tornado/here_now/single.yaml | 18 +++--- .../tornado/publish/do_not_store.yaml | 12 ++-- .../fixtures/tornado/publish/invalid_key.yaml | 12 ++-- .../fixtures/tornado/publish/meta_object.yaml | 12 ++-- .../tornado/publish/mixed_via_get.yaml | 48 +++++++-------- .../publish/mixed_via_get_encrypted.yaml | 48 +++++++-------- .../tornado/publish/mixed_via_post.yaml | 48 +++++++-------- .../publish/mixed_via_post_encrypted.yaml | 48 +++++++-------- .../tornado/publish/not_permitted.yaml | 12 ++-- .../tornado/publish/object_via_get.yaml | 12 ++-- .../publish/object_via_get_encrypted.yaml | 12 ++-- .../tornado/publish/object_via_post.yaml | 12 ++-- .../publish/object_via_post_encrypted.yaml | 12 ++-- .../tornado/state/multiple_channel.yaml | 12 ++-- .../tornado/state/single_channel.yaml | 12 ++-- .../tornado/subscribe/group_join_leave.yaml | 60 +++++++++---------- .../subscribe/group_sub_pub_unsub.yaml | 36 +++++------ .../tornado/subscribe/group_sub_unsub.yaml | 24 ++++---- .../tornado/subscribe/join_leave.yaml | 48 +++++++-------- .../tornado/subscribe/sub_pub_unsub.yaml | 24 ++++---- .../fixtures/tornado/subscribe/sub_unsub.yaml | 12 ++-- .../subscribe/subscribe_tep_by_step.yaml | 24 ++++---- .../tornado/where_now/multiple_channels.yaml | 30 +++++----- .../tornado/where_now/single_channel.yaml | 18 +++--- .../fixtures/twisted/groups/add_channels.yaml | 8 +-- .../twisted/groups/add_single_channel.yaml | 8 +-- .../twisted/groups/list_channels.yaml | 8 +-- .../twisted/groups/remove_channels.yaml | 8 +-- .../twisted/groups/remove_single_channel.yaml | 8 +-- .../fixtures/twisted/here_now/global.yaml | 8 +-- .../fixtures/twisted/here_now/multiple.yaml | 8 +-- .../fixtures/twisted/here_now/single.yaml | 8 +-- .../twisted/publish/do_not_store.yaml | 8 +-- .../fixtures/twisted/publish/forbidden.yaml | 8 +-- .../fixtures/twisted/publish/invalid_key.yaml | 8 +-- .../fixtures/twisted/publish/meta_object.yaml | 8 +-- .../publish/mixed_encrypted_via_get.yaml | 32 +++++----- .../twisted/publish/mixed_via_get.yaml | 32 +++++----- .../twisted/publish/object_via_get.yaml | 8 +-- .../twisted/state/multiple_channels.yaml | 8 +-- .../twisted/state/single_channel.yaml | 8 +-- .../fixtures/twisted/where_now/multiple.yaml | 8 +-- .../fixtures/twisted/where_now/single.yaml | 8 +-- tests/unit/test_utils.py | 2 +- tests/unit/test_vcr_helper.py | 4 +- 125 files changed, 1005 insertions(+), 1005 deletions(-) diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index 88e53d48..0c074538 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:04 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 1f2b05f8..1b8f8ab6 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index 7b0a95f3..dd056260 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14713558782056075"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -26,13 +26,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", @@ -42,13 +42,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -57,13 +57,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&remove=test-channel-groups-asyncio-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=test-channel-groups-asyncio-ch - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} @@ -72,5 +72,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 751489c5..9164310d 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14714204724402473","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:32 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -29,13 +29,13 @@ interactions: CONTENT-LENGTH: '412', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -44,5 +44,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:38 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 0f48a306..2f235c50 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713594568087822","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -28,13 +28,13 @@ interactions: CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -43,5 +43,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index 32071c48..7beb1b61 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713563292410522","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:29 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index 0385c408..ef28f457 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access Manager","status":200}'} @@ -30,13 +30,13 @@ interactions: CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=0&uuid=my_uuid&w=0 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=0&uuid=my_uuid&w=0 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access Manager","status":200}'} @@ -46,5 +46,5 @@ interactions: CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index 76601240..d4bef722 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index e0692709..0e72f69b 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index 5c765a96..2fdaba86 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index bb60b607..6f130f5a 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '345', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml index 69106255..655a3068 100644 --- a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml +++ b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=my_uuid + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=my_uuid response: body: {string: '{"message":"Forbidden","payload":{"channels":["blah"]},"error":true,"service":"Access Manager","status":403} @@ -16,5 +16,5 @@ interactions: CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 14 Oct 2016 12:51:06 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index b8b481a9..3e3c06cd 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:52 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index fd2bec61..b9d406c6 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index d01966b9..9c289e46 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index 64373e81..fb1478d8 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index 933fd554..f0ee4e89 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&store=0 response: body: {string: '[1,"Sent","14715124518965795"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:27:31 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index 10f82367..4d21308a 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[0,"Invalid Key","14715121286597316"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:22:08 GMT'} status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad + url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index 8ba94236..24b688d7 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715122016841196"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:23:21 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.0&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index 0d54d0ac..18fd4e22 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073577558"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073592350"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073603443"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531073604938"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index 5a1dd7eb..565bc12b 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539265931"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539286406"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539293096"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715101539315353"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index 1d0f60d4..a8b172cd 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -2,53 +2,53 @@ interactions: - request: body: 'true' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007838319"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: '"hi"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007890145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: '5' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007894502"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: '["hi", "hi2", "hi3"]' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531007926933"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index 8402c61e..db8c10bf 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500557815"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500599883"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500607388"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113500616628"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index 1906b979..e807cacb 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0×tamp=1476628727 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1×tamp=1476628727 response: body: {string: '[1,"Sent","14766287276539619"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 14:38:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index fb8c0a09..df84bf86 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714531074414363"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index d08b4800..6c922700 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715102088417575"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:50:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index 8cd1db9b..1ae32c84 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '{"online": true, "name": "Alex"}' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14714530475966145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:57:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index a7662618..dc85bf4f 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14715113905714923"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index 81f2f9c9..5ae60f73 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14714344166454996"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:46:56 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.0&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index 318feae3..c662cc5d 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index 726e4f49..0ac32808 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 5e22a814..1f4a36dc 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14724899162046665","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -25,13 +25,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -39,13 +39,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:47 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -53,13 +53,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:52 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:57 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -82,13 +82,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": @@ -98,13 +98,13 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -113,5 +113,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:59:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index e067bc7f..4b9ede5e 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:07 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511480343359","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511480343359 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511480343359 response: body: {string: '{"t":{"t":"14713511489324977","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511488470095","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351148, "uuid": "test-subscribe-asyncio-listener", @@ -41,26 +41,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511480343359 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511480343359 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511488599816","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511489324977 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511489324977 response: body: {string: '{"t":{"t":"14713511498339636","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511497874401","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511489324977 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511489324977 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511498339636 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511498339636 response: body: {string: '{"t":{"t":"14713511502190714","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511499971846","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "leave", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -99,13 +99,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511498339636 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511498339636 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -114,13 +114,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -129,5 +129,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 8ed5049f..fa9e7c3e 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,52 +13,52 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511466073676","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14713511467409673"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511466073676 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511466073676 response: body: {string: '{"t":{"t":"14713511467422512","r":12},"m":[{"a":"2","f":0,"i":"f73c5107-519c-42fd-b1e1-7f9377430082","s":1,"p":{"t":"14713511467409673","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=14713511466073676 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511466073676 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -82,5 +82,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 75858dc4..be7c2557 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14713511453005433","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,13 +41,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -56,5 +56,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index c11693e2..8c8ffac1 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713498789397698","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511412634058","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511411661104","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-listener", @@ -26,26 +26,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511412354502","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -54,13 +54,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511418815177","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511418422322","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "leave", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -99,5 +99,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 841318f6..8932b8c7 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -2,48 +2,48 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511399140178","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14713511400414851"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511400414851","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '226', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index c4f3048e..59d50077 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -2,48 +2,48 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[1,"Sent","14713511404390559"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511404397571","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511404390559","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index a297f961..0ce76304 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14713511396585426","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -26,5 +26,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index 96217de8..de3c6055 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -28,26 +28,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14742262356649203","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:15 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -56,13 +56,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -71,13 +71,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -86,5 +86,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index e572bbc0..9fd2fe03 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '[14766398773102530]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 17:44:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=1517d268-4797-4fcb-941c-0f862e61399f + url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=1517d268-4797-4fcb-941c-0f862e61399f version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index 807d96bb..d275b606 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"t":{"t":"14714362383675346","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:18 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:25 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index ecd5b36f..3f38426a 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14714351489282409","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.0&tt=0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.0] + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index ba5f29e7..3cf61491 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index f4e12afb..53fc4356 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 8ca509df..6c8abdd5 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-native-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 9b849fef..3e6add3a 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14694610268707663"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.0&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.1&seqn=2 response: body: {string: '[1,"Sent","14694610269494321"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.0&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.1&seqn=3 response: body: {string: '[1,"Sent","14694610270571781"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.0&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.1&seqn=4 response: body: {string: '[1,"Sent","14694610271664959"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.0&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.1&seqn=5 response: body: {string: '[1,"Sent","14694610272640835"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14694610268707663,14694610272640835]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index e682296f..3959b239 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14695248164027962"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=2 response: body: {string: '[1,"Sent","14695248165146799"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=3 response: body: {string: '[1,"Sent","14695248166152452"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=4 response: body: {string: '[1,"Sent","14695248167059434"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=5 response: body: {string: '[1,"Sent","14695248167891717"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14695248164027962,14695248167891717]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index 7cb51b48..8d619e19 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"message":"Forbidden","payload":{"channels":["history-native-sync-ch"]},"error":true,"service":"Access Manager","status":403} diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index 83436c9f..38bc24a4 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[0,"Invalid Key","14691119692918567"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index 68bbda37..dda888a4 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119695085971"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index a79784ef..c0c4ad3c 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119697248854"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index 0bab5f0e..af27aa23 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1&store=0 response: body: {string: '[1,"Sent","14691119699221362"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index f2882fde..9e45edcc 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119701316179"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index b10528eb..c558a102 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119703765115"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index bcbb7169..3e7d13cd 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119705911160"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index aef35873..51ad43d4 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119708241133"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index 4914f6d1..df85ded4 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119710341756"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index dbd165b7..dd764153 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['1'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119712785973"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index 87d32e29..ea3e79fa 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119714790991"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index d04020ef..c7b7bf68 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['20'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119717175739"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index 2b3ba5f0..7d9f13fc 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691173575177499"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 919da166..86980e7d 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['32'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119720483041"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index aab0c736..41a0cbe7 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14703077680843249"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index 88a9cfc7..a818e25f 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691119724317947"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index e3d9e0ab..74748858 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14691124461710414"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index 763e07ed..b5e6cae7 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.0&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 response: body: {string: '[1,"Sent","14698699475874207"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index 23da9c5f..d38b4130 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index ee2bf54d..7c545a43 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index 6220ecbd..c25d6a74 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index 1e4f23e0..b3511e04 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index cdf80660..97f71da8 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0&remove=channel-groups-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index b563805b..5e9e9291 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index 1412458f..56cd63ff 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.0] + User-Agent: [PubNub-Python/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml index 5cbda7e5..03c45d14 100644 --- a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml index 4ba778a8..ba483449 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['187'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml index 50fad114..0c37347d 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=channel-groups-tornado-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml index 39617960..a8b68074 100644 --- a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341188112072 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341188112072 response: body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341195231188 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341195231188 response: body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -176,14 +176,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -218,14 +218,14 @@ interactions: - Age - ['3'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -260,14 +260,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341206425665 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341206425665 response: body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -295,14 +295,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14720341368999461 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341368999461 response: body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -330,14 +330,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -373,5 +373,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml index dce0193d..c035b905 100644 --- a/tests/integrational/fixtures/tornado/here_now/global.yaml +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -185,5 +185,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml index 783ba762..5e9fdeed 100644 --- a/tests/integrational/fixtures/tornado/here_now/multiple.yaml +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml index 49ebc86b..79daff87 100644 --- a/tests/integrational/fixtures/tornado/here_now/single.yaml +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:34 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-uuid"], "occupancy": 1}'} @@ -74,14 +74,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:38 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:39 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml index 28f597db..e3171c83 100644 --- a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1&store=0 response: body: {string: '[1,"Sent","14707213568554057"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1&store=0 response: body: {string: '[1,"Sent","14707213569308777"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml index ba99c8e0..53851919 100644 --- a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[0,"Invalid Key","14707240653092162"]'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[0,"Invalid Key","14707240653816927"]'} headers: @@ -64,5 +64,5 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml index 51ae15a6..7ea6f4f3 100644 --- a/tests/integrational/fixtures/tornado/publish/meta_object.yaml +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14707233493629583"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14707233494525529"]'} headers: @@ -64,5 +64,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml index 4f5baff9..2e811cc5 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654961878754"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654962988338"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654963998910"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654965094211"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654966264107"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654968497326"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654969624146"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654971058947"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml index 4af74baf..8ab7da35 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654973576283"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654974534808"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654975469383"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654976370725"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654977343057"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654978302189"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654979370691"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706654980293520"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml index 143a5c9a..4f6f86d2 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789261217101"]'} headers: @@ -31,14 +31,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789261901583"]'} headers: @@ -64,14 +64,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789262581697"]'} headers: @@ -97,14 +97,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789263258448"]'} headers: @@ -130,14 +130,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789263937508"]'} headers: @@ -163,14 +163,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789264623948"]'} headers: @@ -196,14 +196,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789265622885"]'} headers: @@ -229,14 +229,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706789266306131"]'} headers: @@ -262,5 +262,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml index 58a5bba3..1bb89086 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724320847330"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724321905127"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724322939251"]'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724323960752"]'} headers: @@ -130,14 +130,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724325062358"]'} headers: @@ -163,14 +163,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724326150829"]'} headers: @@ -196,14 +196,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724327259504"]'} headers: @@ -229,14 +229,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706724328343318"]'} headers: @@ -262,5 +262,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index fbc8fcea..5aab69ac 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -46,14 +46,14 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -94,5 +94,5 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml index 2924352b..afe64fec 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653397219269"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653398506519"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml index 4cf48bc1..cbc489a2 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653400646308"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706653401928744"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml index 549532ba..2e1ef559 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706787329216107"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff - request: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706787330184998"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml index 139ec069..b24f86d5 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706781595277610"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.1&seqn=1 - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14706781596540558"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.0&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.1&seqn=2 version: 1 diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml index f7581633..0ee92015 100644 --- a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, @@ -85,5 +85,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml index 4fc8147c..d783feee 100644 --- a/tests/integrational/fixtures/tornado/state/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.0&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} @@ -84,5 +84,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index 06a3f811..1fa35531 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708460251954075","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460251954075 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460251954075 response: body: {string: '{"t":{"t":"14708460259366919","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460258668827","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846025, "uuid": "test-subscribe-listener", "occupancy": @@ -109,14 +109,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708460259353278","r":3},"m":[]}'} headers: @@ -142,14 +142,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460259366919 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460259366919 response: body: {string: '{"t":{"t":"14708460267928187","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460266713809","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -177,14 +177,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -220,14 +220,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460267928187 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460267928187 response: body: {string: '{"t":{"t":"14708460271883006","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460269981178","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -255,14 +255,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -298,14 +298,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708460271883006 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460271883006 response: body: {string: '{"t":{"t":"14708460276100655","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460273860352","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846027, "uuid": "test-subscribe-listener", "occupancy": @@ -333,14 +333,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-test-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-test-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -376,5 +376,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index 2acdcd27..59e57ce9 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708450055747125","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14708450057626682"]'} headers: @@ -107,14 +107,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708450055747125 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708450055747125 response: body: {string: '{"t":{"t":"14708450057612306","r":3},"m":[{"a":"2","f":0,"i":"881d453a-4ef5-4dc3-a5a5-be11147ae030","s":1,"p":{"t":"14708450057626682","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} headers: @@ -140,14 +140,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,14 +183,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -226,5 +226,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index 030a8309..31aafd8a 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708447464037454","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,14 +117,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.0&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -160,5 +160,5 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index e0cb6054..e08de460 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708438179383195","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:48 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&uuid=subscribe-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708438179383195 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708438179383195 response: body: {string: '{"t":{"t":"14708443090824007","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443089669538","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844308, "uuid": "subscribe-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708443090868294","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443090824007 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443090824007 response: body: {string: '{"t":{"t":"14708443098649253","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443097146633","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844309, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443098649253 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443098649253 response: body: {string: '{"t":{"t":"14708443101375638","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443100579978","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -169,14 +169,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -212,14 +212,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=14708443101375638 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443101375638 response: body: {string: '{"t":{"t":"14708443105516188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443104721390","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-listener", "occupancy": @@ -247,14 +247,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -290,5 +290,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=subscribe-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index adc6be5f..4a98d68f 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708323099136684","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '[1,"Sent","14708323101133727"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=14708323099136684 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708323099136684 response: body: {string: '{"t":{"t":"14708323101140128","r":3},"m":[{"a":"2","f":0,"i":"970e123c-d9a0-45b8-b885-3dae1011bf03","s":1,"p":{"t":"14708323101133727","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=14708323099136684&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708323099136684&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -140,5 +140,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index 6b395941..0a81d13c 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14708323101261227","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index 2f0ca094..2b4ed761 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717806990508559","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:19 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717807001063591","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:20 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml index 6a63913d..0ec266a2 100644 --- a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", "where-now-tornado-ch1"]}, "service": "Presence"}'} @@ -140,14 +140,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,5 +183,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.0 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml index 1d74a1bf..b4f75974 100644 --- a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 response: body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, "service": "Presence"}'} @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.0] + User-Agent: [PubNub-Python-Tornado/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.0&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml index e4322a71..10361bff 100644 --- a/tests/integrational/fixtures/twisted/groups/add_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml index 278b8c51..3248b6a0 100644 --- a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml index efd8e6ff..0331cf65 100644 --- a/tests/integrational/fixtures/twisted/groups/list_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml index 68bd163b..ebe6d670 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&remove=cgttc0%2Ccgttc1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&remove=cgttc0%2Ccgttc1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml index 320e5c63..862777a4 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&remove=cgttc + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&remove=cgttc response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml index a248c0c3..015d1fc2 100644 --- a/tests/integrational/fixtures/twisted/here_now/global.yaml +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -12,7 +12,7 @@ interactions: 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml index d6d97d50..bdc94e72 100644 --- a/tests/integrational/fixtures/twisted/here_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -2,16 +2,16 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}}, "total_channels": 1, "total_occupancy": 1}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml index b8a7994a..09aff84c 100644 --- a/tests/integrational/fixtures/twisted/here_now/single.yaml +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml index 680e1687..9c793223 100644 --- a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&store=0 response: body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index b3def76f..03ee7492 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -12,7 +12,7 @@ interactions: '} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 403, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.0&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.1&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml index fd221291..d0bec05c 100644 --- a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 400, message: ''} - url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 + url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml index 64df534b..6d3d293e 100644 --- a/tests/integrational/fixtures/twisted/publish/meta_object.yaml +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml index d9dbcfe3..ce98a9ed 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml index a02c17c9..0f971b4d 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml index 5a3ef940..da990669 100644 --- a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml index 01522eb6..ae8d45f3 100644 --- a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.0&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.1&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml index 94c57187..891cb64d 100644 --- a/tests/integrational/fixtures/twisted/state/single_channel.yaml +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.0&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.1&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml index 05169d2b..6137bb5c 100644 --- a/tests/integrational/fixtures/twisted/where_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml index c07440df..d2f04e44 100644 --- a/tests/integrational/fixtures/twisted/where_now/single.yaml +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.0] + user-agent: [PubNub-Python-Twisted/4.0.1] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.0&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f version: 1 diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 2a94d3e8..4552f417 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -72,7 +72,7 @@ def test_sign_sha_256(self): input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 grant -channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.0&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.1&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) assert "Dq92jnwRTCikdeP2nUs1__gyJthF8NChwbs5aYy2r_I=" == result diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index eab52ae9..29310263 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -26,10 +26,10 @@ def test_string_list_in_path_matcher(self): def test_string_list_in_path_query_matcher(self): r1 = Request( - query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), + query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.1'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) r2 = Request( - query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.0'), + query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.1'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) assert string_list_in_query_matcher(r1, r2, ['channel']) From 870e6009e7e9cec265f4a112bacb25b44469222b Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 15:03:17 -0800 Subject: [PATCH 407/468] fix up linting --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9303d2ae..0b28a79e 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -from setuptools import setup,find_packages +from setuptools import setup, find_packages setup( name='pubnub', From 518330c9d9e34ac043dcd397b23c610b9098b738 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 8 Nov 2016 15:17:30 -0800 Subject: [PATCH 408/468] adjust signature --- tests/unit/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 4552f417..f3bb5ce9 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -75,4 +75,4 @@ def test_sign_sha_256(self): channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.1&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) - assert "Dq92jnwRTCikdeP2nUs1__gyJthF8NChwbs5aYy2r_I=" == result + assert "3P7WMijA_gF3mVRq4hUxmzmAl3sm4d_Hgpz2gQW9NrY=" == result From 57ff3261579b53c26434435425f0be65cfc9b814 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 9 Nov 2016 01:48:38 -0800 Subject: [PATCH 409/468] Add message sender uuid info to subscribe envelope --- pubnub/models/consumer/pubsub.py | 9 +++- pubnub/workers.py | 4 +- tests/integrational/asyncio/test_subscribe.py | 17 +++++--- .../asyncio/subscription/sub_pub_unsub.yaml | 43 ++++++------------- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index f54d6f1e..89bf2099 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -2,12 +2,18 @@ class PNMessageResult(object): - def __init__(self, message, subscription, channel, timetoken, user_metadata=None): + def __init__(self, message, subscription, channel, timetoken, user_metadata=None, issuing_client_id=None): assert message is not None + if subscription is not None: assert isinstance(subscription, six.string_types) + if channel is not None: assert isinstance(channel, six.string_types) + + if issuing_client_id is not None: + assert isinstance(issuing_client_id, six.string_types) + assert isinstance(timetoken, six.integer_types) if user_metadata is not None: @@ -23,6 +29,7 @@ def __init__(self, message, subscription, channel, timetoken, user_metadata=None self.timetoken = timetoken self.user_metadata = user_metadata + self.issuing_client_id = issuing_client_id class PNPresenceEventResult(object): diff --git a/pubnub/workers.py b/pubnub/workers.py index f984b461..08ad62cc 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -69,6 +69,7 @@ def _process_incoming_payload(self, message): self._listener_manager.announce_presence(pn_presence_event_result) else: extracted_message = self._process_message(message.payload) + issuing_client_id = message.issuing_client_id if extracted_message is None: logger.debug("unable to parse payload on #processIncomingMessages") @@ -77,7 +78,8 @@ def _process_incoming_payload(self, message): message=extracted_message, channel=channel, subscription=subscription_match, - timetoken=publish_meta_data.publish_timetoken + timetoken=publish_meta_data.publish_timetoken, + issuing_client_id=issuing_client_id ) self._listener_manager.announce_message(pn_message_result) diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 95d0e504..e70d5079 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -45,18 +45,20 @@ def test_subscribe_unsubscribe(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml') @pytest.mark.asyncio def test_subscribe_publish_unsubscribe(event_loop): - pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) - pubnub.config.uuid = 'test-subscribe-asyncio-uuid' + pubnub_sub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub_pub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + pubnub_sub.config.uuid = 'test-subscribe-asyncio-uuid-sub' + pubnub_pub.config.uuid = 'test-subscribe-asyncio-uuid-pub' callback = SubscribeListener() channel = "test-subscribe-asyncio-ch" message = "hey" - pubnub.add_listener(callback) - pubnub.subscribe().channels(channel).execute() + pubnub_sub.add_listener(callback) + pubnub_sub.subscribe().channels(channel).execute() yield from callback.wait_for_connect() - publish_future = asyncio.ensure_future(pubnub.publish().channel(channel).message(message).future()) + publish_future = asyncio.ensure_future(pubnub_pub.publish().channel(channel).message(message).future()) subscribe_message_future = asyncio.ensure_future(callback.wait_for_message_on(channel)) yield from asyncio.wait([ @@ -77,10 +79,11 @@ def test_subscribe_publish_unsubscribe(event_loop): assert publish_envelope.result.timetoken > 0 assert publish_envelope.status.original_response[0] == 1 - pubnub.unsubscribe().channels(channel).execute() + pubnub_sub.unsubscribe().channels(channel).execute() yield from callback.wait_for_disconnect() - pubnub.stop() + pubnub_pub.stop() + pubnub_sub.stop() @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml') diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 8932b8c7..75d860d1 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -4,53 +4,38 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-uuid-sub response: - body: {string: '{"t":{"t":"14713511399140178","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14786823981211583","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-uuid-sub - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=test-subscribe-asyncio-uuid-pub response: - body: {string: '[1,"Sent","14713511400414851"]'} + body: {string: '[1,"Sent","14786827442126245"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=test-subscribe-asyncio-uuid-pub - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.1] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub response: - body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511400414851","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} + body: {string: '{"t":{"t":"14786827442166827","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14786827442126245","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '226', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511399140178&pnsdk=PubNub-Python-Asyncio%2F4.0.1 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] - method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 - response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} - headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', - ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub version: 1 From 8062201ae3e6bae44cae06116473c671c9861d8e Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 14 Nov 2016 13:16:21 -0800 Subject: [PATCH 410/468] increase pool size --- pubnub/request_handlers/requests_handler.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index eecc7c4e..fef86e00 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -4,6 +4,8 @@ import six from requests import Session +from requests.adapters import HTTPAdapter + from pubnub import utils from pubnub.enums import PNStatusCategory from pubnub.errors import PNERR_CLIENT_ERROR, PNERR_UNKNOWN_ERROR, PNERR_TOO_MANY_REDIRECTS_ERROR,\ @@ -22,6 +24,10 @@ class RequestsRequestHandler(BaseRequestHandler): def __init__(self, pubnub): self.session = Session() + + self.session.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.pubnub = pubnub def sync_request(self, platform_options, endpoint_call_options): From de04aad4092382687ed3c88b96d5e97347d3abd4 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 14 Nov 2016 13:28:36 -0800 Subject: [PATCH 411/468] 4.0.2 --- .pubnub.yml | 7 ++++++- pubnub/pubnub_core.py | 2 +- setup.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 2112af22..b8ca111f 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.1 +version: 4.0.2 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.2 + date: + changes: + - type: improvement + text: Adjusting maximum pool size for requests installations - version: v4.0.1 date: changes: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index c8ee5a5c..1a0f64eb 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.1" + SDK_VERSION = "4.0.2" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index 0b28a79e..061f736a 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.1', + version='4.0.2', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 16a485b9c75e5a1516c9e1ea4581f4ec790d324c Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 14 Nov 2016 13:31:46 -0800 Subject: [PATCH 412/468] 4.0.2 --- .pubnub.yml | 3 +++ pubnub/models/consumer/pubsub.py | 8 ++++---- pubnub/workers.py | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index b8ca111f..5f1547ca 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -8,6 +8,8 @@ changelog: changes: - type: improvement text: Adjusting maximum pool size for requests installations + - type: improvement + text: Adding Publsher UUID - version: v4.0.1 date: changes: @@ -57,3 +59,4 @@ features: - SUBSCRIBE-PRESENCE-CHANNELS-GROUPS - SUBSCRIBE-WITH-TIMETOKEN - SUBSCRIBE-WILDCARD + - SUBSCRIBE-SENDER-UUID diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index 89bf2099..89e0d648 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -2,7 +2,7 @@ class PNMessageResult(object): - def __init__(self, message, subscription, channel, timetoken, user_metadata=None, issuing_client_id=None): + def __init__(self, message, subscription, channel, timetoken, user_metadata=None, publisher=None): assert message is not None if subscription is not None: @@ -11,8 +11,8 @@ def __init__(self, message, subscription, channel, timetoken, user_metadata=None if channel is not None: assert isinstance(channel, six.string_types) - if issuing_client_id is not None: - assert isinstance(issuing_client_id, six.string_types) + if publisher is not None: + assert isinstance(publisher, six.string_types) assert isinstance(timetoken, six.integer_types) @@ -29,7 +29,7 @@ def __init__(self, message, subscription, channel, timetoken, user_metadata=None self.timetoken = timetoken self.user_metadata = user_metadata - self.issuing_client_id = issuing_client_id + self.publisher = publisher class PNPresenceEventResult(object): diff --git a/pubnub/workers.py b/pubnub/workers.py index 08ad62cc..598ec9f6 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -69,7 +69,7 @@ def _process_incoming_payload(self, message): self._listener_manager.announce_presence(pn_presence_event_result) else: extracted_message = self._process_message(message.payload) - issuing_client_id = message.issuing_client_id + publisher = message.issuing_client_id if extracted_message is None: logger.debug("unable to parse payload on #processIncomingMessages") @@ -79,7 +79,7 @@ def _process_incoming_payload(self, message): channel=channel, subscription=subscription_match, timetoken=publish_meta_data.publish_timetoken, - issuing_client_id=issuing_client_id + issuing_client_id=publisher ) self._listener_manager.announce_message(pn_message_result) From 62e0efc74e4dcff794474da410cf095b80eaa085 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Mon, 14 Nov 2016 14:05:31 -0800 Subject: [PATCH 413/468] bump test fixtures --- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channels.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 30 +++++----- .../fixtures/asyncio/here_now/global.yaml | 18 +++--- .../asyncio/here_now/multiple_channels.yaml | 18 +++--- .../asyncio/here_now/single_channel.yaml | 18 +++--- .../fixtures/asyncio/pam/global_level.yaml | 18 +++--- .../asyncio/pam/multiple_channel_groups.yaml | 12 ++-- .../multiple_channel_groups_with_auth.yaml | 12 ++-- .../asyncio/pam/multiple_channels.yaml | 12 ++-- .../pam/multiple_channels_with_auth.yaml | 12 ++-- .../asyncio/pam/sign_non_pam_request.yaml | 6 +- .../fixtures/asyncio/pam/single_channel.yaml | 12 ++-- .../asyncio/pam/single_channel_group.yaml | 12 ++-- .../pam/single_channel_group_with_auth.yaml | 12 ++-- .../asyncio/pam/single_channel_with_auth.yaml | 12 ++-- .../asyncio/publish/do_not_store.yaml | 6 +- .../fixtures/asyncio/publish/invalid_key.yaml | 6 +- .../fixtures/asyncio/publish/meta_object.yaml | 6 +- .../asyncio/publish/mixed_via_get.yaml | 24 ++++---- .../publish/mixed_via_get_encrypted.yaml | 24 ++++---- .../asyncio/publish/mixed_via_post.yaml | 24 ++++---- .../publish/mixed_via_post_encrypted.yaml | 24 ++++---- .../asyncio/publish/not_permitted.yaml | 6 +- .../asyncio/publish/object_via_get.yaml | 6 +- .../publish/object_via_get_encrypted.yaml | 6 +- .../asyncio/publish/object_via_post.yaml | 6 +- .../publish/object_via_post_encrypted.yaml | 6 +- .../fixtures/asyncio/secure/ssl.yaml | 6 +- .../asyncio/state/multiple_channel.yaml | 8 +-- .../asyncio/state/single_channel.yaml | 8 +-- .../single_channel_with_subscription.yaml | 48 +++++++-------- .../asyncio/subscription/cg_join_leave.yaml | 54 ++++++++--------- .../subscription/cg_sub_pub_unsub.yaml | 36 +++++------ .../asyncio/subscription/cg_sub_unsub.yaml | 24 ++++---- .../asyncio/subscription/join_leave.yaml | 42 ++++++------- .../asyncio/subscription/sub_pub_unsub.yaml | 18 +++--- .../subscription/sub_pub_unsub_enc.yaml | 24 ++++---- .../asyncio/subscription/sub_unsub.yaml | 12 ++-- .../asyncio/subscription/unsubscribe_all.yaml | 36 +++++------ .../fixtures/asyncio/time/get.yaml | 6 +- .../asyncio/where_now/multiple_channels.yaml | 18 +++--- .../asyncio/where_now/single_channel.yaml | 18 +++--- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../fixtures/native_sync/history/basic.yaml | 24 ++++---- .../fixtures/native_sync/history/encoded.yaml | 24 ++++---- .../native_sync/history/not_permitted.yaml | 4 +- .../native_sync/publish/invalid_key.yaml | 4 +- .../native_sync/publish/publish_bool_get.yaml | 4 +- .../publish/publish_bool_post.yaml | 4 +- .../publish/publish_do_not_store.yaml | 4 +- .../publish/publish_encrypted_list_get.yaml | 4 +- .../publish/publish_encrypted_list_post.yaml | 4 +- .../publish/publish_encrypted_string_get.yaml | 4 +- .../publish_encrypted_string_post.yaml | 4 +- .../native_sync/publish/publish_int_get.yaml | 4 +- .../native_sync/publish/publish_int_post.yaml | 4 +- .../native_sync/publish/publish_list_get.yaml | 4 +- .../publish/publish_list_post.yaml | 4 +- .../publish/publish_object_get.yaml | 4 +- .../publish/publish_object_post.yaml | 4 +- .../publish/publish_string_get.yaml | 4 +- .../publish/publish_string_post.yaml | 4 +- .../publish/publish_with_meta.yaml | 4 +- .../fixtures/native_sync/ssl/ssl.yaml | 4 +- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channel.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 24 ++++---- .../fixtures/tornado/heartbeat/timeout.yaml | 60 +++++++++---------- .../fixtures/tornado/here_now/global.yaml | 30 +++++----- .../fixtures/tornado/here_now/multiple.yaml | 24 ++++---- .../fixtures/tornado/here_now/single.yaml | 18 +++--- .../tornado/publish/do_not_store.yaml | 12 ++-- .../fixtures/tornado/publish/invalid_key.yaml | 12 ++-- .../fixtures/tornado/publish/meta_object.yaml | 12 ++-- .../tornado/publish/mixed_via_get.yaml | 48 +++++++-------- .../publish/mixed_via_get_encrypted.yaml | 48 +++++++-------- .../tornado/publish/mixed_via_post.yaml | 48 +++++++-------- .../publish/mixed_via_post_encrypted.yaml | 48 +++++++-------- .../tornado/publish/not_permitted.yaml | 12 ++-- .../tornado/publish/object_via_get.yaml | 12 ++-- .../publish/object_via_get_encrypted.yaml | 12 ++-- .../tornado/publish/object_via_post.yaml | 12 ++-- .../publish/object_via_post_encrypted.yaml | 12 ++-- .../tornado/state/multiple_channel.yaml | 12 ++-- .../tornado/state/single_channel.yaml | 12 ++-- .../tornado/subscribe/group_join_leave.yaml | 60 +++++++++---------- .../subscribe/group_sub_pub_unsub.yaml | 36 +++++------ .../tornado/subscribe/group_sub_unsub.yaml | 24 ++++---- .../tornado/subscribe/join_leave.yaml | 48 +++++++-------- .../tornado/subscribe/sub_pub_unsub.yaml | 24 ++++---- .../fixtures/tornado/subscribe/sub_unsub.yaml | 12 ++-- .../subscribe/subscribe_tep_by_step.yaml | 24 ++++---- .../tornado/where_now/multiple_channels.yaml | 30 +++++----- .../tornado/where_now/single_channel.yaml | 18 +++--- .../fixtures/twisted/groups/add_channels.yaml | 8 +-- .../twisted/groups/add_single_channel.yaml | 8 +-- .../twisted/groups/list_channels.yaml | 8 +-- .../twisted/groups/remove_channels.yaml | 8 +-- .../twisted/groups/remove_single_channel.yaml | 8 +-- .../fixtures/twisted/here_now/global.yaml | 8 +-- .../fixtures/twisted/here_now/multiple.yaml | 8 +-- .../fixtures/twisted/here_now/single.yaml | 8 +-- .../twisted/publish/do_not_store.yaml | 8 +-- .../fixtures/twisted/publish/forbidden.yaml | 8 +-- .../fixtures/twisted/publish/invalid_key.yaml | 8 +-- .../fixtures/twisted/publish/meta_object.yaml | 8 +-- .../publish/mixed_encrypted_via_get.yaml | 32 +++++----- .../twisted/publish/mixed_via_get.yaml | 32 +++++----- .../twisted/publish/object_via_get.yaml | 8 +-- .../twisted/state/multiple_channels.yaml | 8 +-- .../twisted/state/single_channel.yaml | 8 +-- .../fixtures/twisted/where_now/multiple.yaml | 8 +-- .../fixtures/twisted/where_now/single.yaml | 8 +-- tests/unit/test_utils.py | 2 +- tests/unit/test_vcr_helper.py | 4 +- 125 files changed, 1002 insertions(+), 1002 deletions(-) diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index 0c074538..39e1d469 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:04 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 1b8f8ab6..6b0eb0c1 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index dd056260..6abd8d1a 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14713558782056075"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -26,13 +26,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", @@ -42,13 +42,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=test-channel-groups-asyncio-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -57,13 +57,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&remove=test-channel-groups-asyncio-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-channel-groups-asyncio-ch - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} @@ -72,5 +72,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 9164310d..4b96973e 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14714204724402473","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:32 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -29,13 +29,13 @@ interactions: CONTENT-LENGTH: '412', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -44,5 +44,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:38 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 2f235c50..041e2f9e 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713594568087822","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -28,13 +28,13 @@ interactions: CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -43,5 +43,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index 7beb1b61..e05bbd11 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14713563292410522","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:29 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index ef28f457..e81a2e64 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access Manager","status":200}'} @@ -30,13 +30,13 @@ interactions: CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=0&uuid=my_uuid&w=0 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=0&uuid=my_uuid&w=0 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access Manager","status":200}'} @@ -46,5 +46,5 @@ interactions: CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index d4bef722..d7c9b49e 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index 0e72f69b..e2b05ca8 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index 2fdaba86..c9624b20 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index 6f130f5a..fd576eb2 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '345', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml index 655a3068..2d1f37a5 100644 --- a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml +++ b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=my_uuid + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=my_uuid response: body: {string: '{"message":"Forbidden","payload":{"channels":["blah"]},"error":true,"service":"Access Manager","status":403} @@ -16,5 +16,5 @@ interactions: CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 14 Oct 2016 12:51:06 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index 3e3c06cd..d4e2aac5 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:52 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index b9d406c6..dad5fe54 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index 9c289e46..044a93d5 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index fb1478d8..54ac6993 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index f0ee4e89..83b1fc97 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&store=0 response: body: {string: '[1,"Sent","14715124518965795"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:27:31 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index 4d21308a..ecbe6295 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[0,"Invalid Key","14715121286597316"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:22:08 GMT'} status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad + url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index 24b688d7..a58eadac 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715122016841196"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:23:21 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.2&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index 18fd4e22..c2432b54 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531073577558"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531073592350"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531073603443"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531073604938"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index 565bc12b..8be60d27 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715101539265931"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715101539286406"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715101539293096"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715101539315353"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index a8b172cd..128b5b8f 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -2,53 +2,53 @@ interactions: - request: body: 'true' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531007838319"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: '"hi"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531007890145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: '5' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531007894502"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: '["hi", "hi2", "hi3"]' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531007926933"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index db8c10bf..958c5fb1 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715113500557815"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715113500599883"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715113500607388"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715113500616628"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index e807cacb..52595739 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1×tamp=1476628727 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2×tamp=1476628727 response: body: {string: '[1,"Sent","14766287276539619"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 14:38:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index df84bf86..d525e411 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714531074414363"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index 6c922700..fe156aa0 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715102088417575"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:50:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index 1ae32c84..8bbc7c45 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '{"online": true, "name": "Alex"}' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14714530475966145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:57:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index dc85bf4f..f5d8c25f 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14715113905714923"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index 5ae60f73..1e64a0aa 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14714344166454996"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:46:56 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index c662cc5d..e2798dcf 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index 0ac32808..f2f37645 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.2&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 1f4a36dc..429793b8 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14724899162046665","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -25,13 +25,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -39,13 +39,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:47 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -53,13 +53,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:52 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:57 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -82,13 +82,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": @@ -98,13 +98,13 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -113,5 +113,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:59:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index 4b9ede5e..769d2dfe 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:07 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14713511480343359","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511480343359 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511480343359 response: body: {string: '{"t":{"t":"14713511489324977","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511488470095","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351148, "uuid": "test-subscribe-asyncio-listener", @@ -41,26 +41,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511480343359 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511480343359 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14713511488599816","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511489324977 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511489324977 response: body: {string: '{"t":{"t":"14713511498339636","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511497874401","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511489324977 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511489324977 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511498339636 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511498339636 response: body: {string: '{"t":{"t":"14713511502190714","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511499971846","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "leave", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -99,13 +99,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511498339636 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511498339636 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -114,13 +114,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -129,5 +129,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index fa9e7c3e..2d39a967 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,52 +13,52 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14713511466073676","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14713511467409673"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511466073676 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511466073676 response: body: {string: '{"t":{"t":"14713511467422512","r":12},"m":[{"a":"2","f":0,"i":"f73c5107-519c-42fd-b1e1-7f9377430082","s":1,"p":{"t":"14713511467409673","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=14713511466073676 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511466073676 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -82,5 +82,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index be7c2557..66972ef3 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14713511453005433","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,13 +41,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -56,5 +56,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index 8c8ffac1..ff87f671 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713498789397698","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511412634058","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511411661104","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-listener", @@ -26,26 +26,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511412354502","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -54,13 +54,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511418815177","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511418422322","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "leave", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -99,5 +99,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 75d860d1..dcc926bb 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -2,40 +2,40 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-uuid-sub + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"t":{"t":"14786823981211583","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-uuid-sub + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-uuid-sub - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=test-subscribe-asyncio-uuid-pub + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=test-subscribe-asyncio-uuid-pub response: body: {string: '[1,"Sent","14786827442126245"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=test-subscribe-asyncio-uuid-pub + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=test-subscribe-asyncio-uuid-pub - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"t":{"t":"14786827442166827","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14786827442126245","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index 59d50077..110cc1d9 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -2,48 +2,48 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[1,"Sent","14713511404390559"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511404397571","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511404390559","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index 0ce76304..21ab15e0 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14713511396585426","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -26,5 +26,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index de3c6055..a1fe37f5 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -28,26 +28,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14742262356649203","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:15 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -56,13 +56,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -71,13 +71,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -86,5 +86,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index 9fd2fe03..3e469742 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '[14766398773102530]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 17:44:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=1517d268-4797-4fcb-941c-0f862e61399f + url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=1517d268-4797-4fcb-941c-0f862e61399f version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index d275b606..5c317bef 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"t":{"t":"14714362383675346","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:18 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:25 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index 3f38426a..3de35653 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14714351489282409","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.1&tt=0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.1&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index 3cf61491..61428abd 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index 53fc4356..51b83847 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 6c8abdd5..bc15ed60 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-native-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 3e6add3a..52207962 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14694610268707663"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.1&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.2&seqn=2 response: body: {string: '[1,"Sent","14694610269494321"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.1&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.2&seqn=3 response: body: {string: '[1,"Sent","14694610270571781"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.1&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.2&seqn=4 response: body: {string: '[1,"Sent","14694610271664959"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.1&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.2&seqn=5 response: body: {string: '[1,"Sent","14694610272640835"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14694610268707663,14694610272640835]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index 3959b239..c3a5045b 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14695248164027962"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=2 response: body: {string: '[1,"Sent","14695248165146799"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=3 response: body: {string: '[1,"Sent","14695248166152452"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=4 response: body: {string: '[1,"Sent","14695248167059434"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=5 response: body: {string: '[1,"Sent","14695248167891717"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14695248164027962,14695248167891717]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index 8d619e19..3bf9e5f5 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"message":"Forbidden","payload":{"channels":["history-native-sync-ch"]},"error":true,"service":"Access Manager","status":403} diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index 38bc24a4..ba6dbf55 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[0,"Invalid Key","14691119692918567"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index dda888a4..bdd8ed2b 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119695085971"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index c0c4ad3c..fef441e2 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119697248854"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index af27aa23..1d4d8b50 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1&store=0 response: body: {string: '[1,"Sent","14691119699221362"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index 9e45edcc..67d52c14 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119701316179"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index c558a102..2f3b2b60 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119703765115"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index 3e7d13cd..d68c9a39 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119705911160"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index 51ad43d4..c49bbf5b 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119708241133"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index df85ded4..d27f1518 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119710341756"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index dd764153..6bda3152 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['1'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119712785973"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index ea3e79fa..913ea757 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119714790991"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index c7b7bf68..92127d82 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['20'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119717175739"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index 7d9f13fc..4c17f57a 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691173575177499"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 86980e7d..6fa71e31 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['32'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119720483041"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index 41a0cbe7..d57a6b64 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14703077680843249"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index a818e25f..b5b5da67 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691119724317947"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index 74748858..3b429bf0 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14691124461710414"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index b5e6cae7..f9c2381c 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.1&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 response: body: {string: '[1,"Sent","14698699475874207"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index d38b4130..7b97da55 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index 7c545a43..6af8edaa 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index c25d6a74..be6113dc 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index b3511e04..efecc3c6 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index 97f71da8..64d6805e 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1&remove=channel-groups-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index 5e9e9291..2e619485 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index 56cd63ff..db88f9e5 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.1] + User-Agent: [PubNub-Python/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml index 03c45d14..80074015 100644 --- a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml index ba483449..61808e71 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['187'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml index 0c37347d..658fc494 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=channel-groups-tornado-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml index a8b68074..85beb311 100644 --- a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341188112072 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341188112072 response: body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341195231188 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341195231188 response: body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -176,14 +176,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -218,14 +218,14 @@ interactions: - Age - ['3'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -260,14 +260,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341206425665 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341206425665 response: body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -295,14 +295,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14720341368999461 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341368999461 response: body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -330,14 +330,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -373,5 +373,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml index c035b905..e7e76058 100644 --- a/tests/integrational/fixtures/tornado/here_now/global.yaml +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -185,5 +185,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml index 5e9fdeed..180325b4 100644 --- a/tests/integrational/fixtures/tornado/here_now/multiple.yaml +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml index 79daff87..e2b4d16d 100644 --- a/tests/integrational/fixtures/tornado/here_now/single.yaml +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:34 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-uuid"], "occupancy": 1}'} @@ -74,14 +74,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:38 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:39 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml index e3171c83..a938b7af 100644 --- a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&store=0 response: body: {string: '[1,"Sent","14707213568554057"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&store=0 response: body: {string: '[1,"Sent","14707213569308777"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml index 53851919..84532836 100644 --- a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[0,"Invalid Key","14707240653092162"]'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[0,"Invalid Key","14707240653816927"]'} headers: @@ -64,5 +64,5 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml index 7ea6f4f3..ab79b915 100644 --- a/tests/integrational/fixtures/tornado/publish/meta_object.yaml +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14707233493629583"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14707233494525529"]'} headers: @@ -64,5 +64,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml index 2e811cc5..f46314bd 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654961878754"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654962988338"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654963998910"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654965094211"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654966264107"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654968497326"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654969624146"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654971058947"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml index 8ab7da35..b6f8be17 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654973576283"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654974534808"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654975469383"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654976370725"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654977343057"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654978302189"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654979370691"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706654980293520"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml index 4f6f86d2..6f84db1f 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789261217101"]'} headers: @@ -31,14 +31,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789261901583"]'} headers: @@ -64,14 +64,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789262581697"]'} headers: @@ -97,14 +97,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789263258448"]'} headers: @@ -130,14 +130,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789263937508"]'} headers: @@ -163,14 +163,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789264623948"]'} headers: @@ -196,14 +196,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789265622885"]'} headers: @@ -229,14 +229,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706789266306131"]'} headers: @@ -262,5 +262,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml index 1bb89086..0d03d956 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724320847330"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724321905127"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724322939251"]'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724323960752"]'} headers: @@ -130,14 +130,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724325062358"]'} headers: @@ -163,14 +163,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724326150829"]'} headers: @@ -196,14 +196,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724327259504"]'} headers: @@ -229,14 +229,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706724328343318"]'} headers: @@ -262,5 +262,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index 5aab69ac..b4089255 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -46,14 +46,14 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -94,5 +94,5 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml index afe64fec..291a8eae 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706653397219269"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706653398506519"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml index cbc489a2..901430d0 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706653400646308"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706653401928744"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml index 2e1ef559..0a1c4e73 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706787329216107"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff - request: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706787330184998"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml index b24f86d5..ef876aa2 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706781595277610"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1 - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14706781596540558"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.1&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=2 version: 1 diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml index 0ee92015..32703c1f 100644 --- a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, @@ -85,5 +85,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml index d783feee..7a8de326 100644 --- a/tests/integrational/fixtures/tornado/state/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.1&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} @@ -84,5 +84,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index 1fa35531..ea4e4473 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708460251954075","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460251954075 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460251954075 response: body: {string: '{"t":{"t":"14708460259366919","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460258668827","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846025, "uuid": "test-subscribe-listener", "occupancy": @@ -109,14 +109,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708460259353278","r":3},"m":[]}'} headers: @@ -142,14 +142,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460259366919 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460259366919 response: body: {string: '{"t":{"t":"14708460267928187","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460266713809","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -177,14 +177,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -220,14 +220,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460267928187 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460267928187 response: body: {string: '{"t":{"t":"14708460271883006","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460269981178","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -255,14 +255,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -298,14 +298,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708460271883006 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460271883006 response: body: {string: '{"t":{"t":"14708460276100655","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460273860352","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846027, "uuid": "test-subscribe-listener", "occupancy": @@ -333,14 +333,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-test-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-test-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -376,5 +376,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index 59e57ce9..ab7614d5 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708450055747125","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14708450057626682"]'} headers: @@ -107,14 +107,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708450055747125 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708450055747125 response: body: {string: '{"t":{"t":"14708450057612306","r":3},"m":[{"a":"2","f":0,"i":"881d453a-4ef5-4dc3-a5a5-be11147ae030","s":1,"p":{"t":"14708450057626682","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} headers: @@ -140,14 +140,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,14 +183,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -226,5 +226,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index 31aafd8a..a5fadbe8 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708447464037454","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,14 +117,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.1&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -160,5 +160,5 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index e08de460..4258e4f0 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708438179383195","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:48 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&uuid=subscribe-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708438179383195 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708438179383195 response: body: {string: '{"t":{"t":"14708443090824007","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443089669538","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844308, "uuid": "subscribe-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708443090868294","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443090824007 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443090824007 response: body: {string: '{"t":{"t":"14708443098649253","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443097146633","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844309, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443098649253 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443098649253 response: body: {string: '{"t":{"t":"14708443101375638","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443100579978","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -169,14 +169,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -212,14 +212,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=14708443101375638 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443101375638 response: body: {string: '{"t":{"t":"14708443105516188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443104721390","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-listener", "occupancy": @@ -247,14 +247,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -290,5 +290,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index 4a98d68f..327cd265 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708323099136684","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '[1,"Sent","14708323101133727"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=14708323099136684 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708323099136684 response: body: {string: '{"t":{"t":"14708323101140128","r":3},"m":[{"a":"2","f":0,"i":"970e123c-d9a0-45b8-b885-3dae1011bf03","s":1,"p":{"t":"14708323101133727","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=14708323099136684&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708323099136684&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -140,5 +140,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index 0a81d13c..6ba9b1c8 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14708323101261227","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index 2b4ed761..c53545e8 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14717806990508559","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:19 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717807001063591","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:20 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml index 0ec266a2..d881a954 100644 --- a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", "where-now-tornado-ch1"]}, "service": "Presence"}'} @@ -140,14 +140,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,5 +183,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.1 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml index b4f75974..99b61b1f 100644 --- a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=where-now-tornado-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, "service": "Presence"}'} @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=where-now-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.1] + User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.1&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=where-now-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml index 10361bff..adfcacc8 100644 --- a/tests/integrational/fixtures/twisted/groups/add_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml index 3248b6a0..782e5e0a 100644 --- a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml index 0331cf65..cddf7f4c 100644 --- a/tests/integrational/fixtures/twisted/groups/list_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml index ebe6d670..f8f7aada 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&remove=cgttc0%2Ccgttc1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&remove=cgttc0%2Ccgttc1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml index 862777a4..552b6f5e 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&remove=cgttc + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&remove=cgttc response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml index 015d1fc2..8a7dcb4d 100644 --- a/tests/integrational/fixtures/twisted/here_now/global.yaml +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -12,7 +12,7 @@ interactions: 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml index bdc94e72..9540b5b6 100644 --- a/tests/integrational/fixtures/twisted/here_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -2,16 +2,16 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}}, "total_channels": 1, "total_occupancy": 1}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml index 09aff84c..7aa8c34a 100644 --- a/tests/integrational/fixtures/twisted/here_now/single.yaml +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml index 9c793223..6c9888f1 100644 --- a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&store=0 response: body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index 03ee7492..2480c0c2 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -12,7 +12,7 @@ interactions: '} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 403, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.1&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.2&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml index d0bec05c..3f92969c 100644 --- a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 400, message: ''} - url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 + url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml index 6d3d293e..1d1a3317 100644 --- a/tests/integrational/fixtures/twisted/publish/meta_object.yaml +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml index ce98a9ed..75a04ee0 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml index 0f971b4d..c8c75764 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml index da990669..8483152e 100644 --- a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml index ae8d45f3..de21f1cd 100644 --- a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.1&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.2&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml index 891cb64d..6b659ffe 100644 --- a/tests/integrational/fixtures/twisted/state/single_channel.yaml +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.1&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.2&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml index 6137bb5c..eee03a04 100644 --- a/tests/integrational/fixtures/twisted/where_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml index d2f04e44..bf13ad0e 100644 --- a/tests/integrational/fixtures/twisted/where_now/single.yaml +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.1] + user-agent: [PubNub-Python-Twisted/4.0.2] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.1&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f version: 1 diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index f3bb5ce9..d17fb6f9 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -72,7 +72,7 @@ def test_sign_sha_256(self): input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 grant -channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.1&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.2&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) assert "3P7WMijA_gF3mVRq4hUxmzmAl3sm4d_Hgpz2gQW9NrY=" == result diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index 29310263..9bad8b38 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -26,10 +26,10 @@ def test_string_list_in_path_matcher(self): def test_string_list_in_path_query_matcher(self): r1 = Request( - query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.1'), + query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.2'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) r2 = Request( - query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.1'), + query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.2'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) assert string_list_in_query_matcher(r1, r2, ['channel']) From 3da15167c608c91c0338d17edad35ee45e5dc322 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 15 Nov 2016 11:40:30 -0800 Subject: [PATCH 414/468] avoid pushing tests and examples to pypi --- pubnub/workers.py | 2 +- setup.py | 2 +- tests/helper.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pubnub/workers.py b/pubnub/workers.py index 598ec9f6..494fdf85 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -79,7 +79,7 @@ def _process_incoming_payload(self, message): channel=channel, subscription=subscription_match, timetoken=publish_meta_data.publish_timetoken, - issuing_client_id=publisher + publisher=publisher ) self._listener_manager.announce_message(pn_message_result) diff --git a/setup.py b/setup.py index 061f736a..749fb506 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ author='PubNub', author_email='support@pubnub.com', url='http://pubnub.com', - packages=find_packages(), + packages=find_packages(exclude=("examples*", 'tests*')), license='MIT', classifiers=( 'Development Status :: 5 - Production/Stable', diff --git a/tests/helper.py b/tests/helper.py index a1d996cf..dab0489c 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -11,7 +11,6 @@ try: from mock import patch except ImportError: - from unittest.mock import patch # noqa: F401 pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" From 979f802fca6297b1dac1f98815132b27f44207d8 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 15 Nov 2016 11:47:36 -0800 Subject: [PATCH 415/468] clean up flake8 from install files --- requirements-dev.txt | 1 + requirements-pypy-dev.txt | 3 +-- requirements27-dev.txt | 3 +-- requirements33-dev.txt | 3 +-- requirements34-dev.txt | 3 +-- requirements35-dev.txt | 3 +-- requirements36-dev.txt | 3 +-- 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 22d465cb..c48dfc9f 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,4 +4,5 @@ codecov pycryptodomex pytest-benchmark twisted +flake8 -e git://github.com/pubnub/vcrpy@twisted#egg=vcrpy diff --git a/requirements-pypy-dev.txt b/requirements-pypy-dev.txt index 06923dc1..716f2ab7 100644 --- a/requirements-pypy-dev.txt +++ b/requirements-pypy-dev.txt @@ -1,2 +1 @@ -tornado -flake8 \ No newline at end of file +tornado \ No newline at end of file diff --git a/requirements27-dev.txt b/requirements27-dev.txt index 38fc4d1b..189e222c 100644 --- a/requirements27-dev.txt +++ b/requirements27-dev.txt @@ -1,3 +1,2 @@ tornado -pyopenssl -flake8 \ No newline at end of file +pyopenssl \ No newline at end of file diff --git a/requirements33-dev.txt b/requirements33-dev.txt index 06923dc1..716f2ab7 100644 --- a/requirements33-dev.txt +++ b/requirements33-dev.txt @@ -1,2 +1 @@ -tornado -flake8 \ No newline at end of file +tornado \ No newline at end of file diff --git a/requirements34-dev.txt b/requirements34-dev.txt index b497f456..c680ba33 100644 --- a/requirements34-dev.txt +++ b/requirements34-dev.txt @@ -1,4 +1,3 @@ pytest-asyncio tornado -aiohttp -flake8 \ No newline at end of file +aiohttp \ No newline at end of file diff --git a/requirements35-dev.txt b/requirements35-dev.txt index b497f456..c680ba33 100644 --- a/requirements35-dev.txt +++ b/requirements35-dev.txt @@ -1,4 +1,3 @@ pytest-asyncio tornado -aiohttp -flake8 \ No newline at end of file +aiohttp \ No newline at end of file diff --git a/requirements36-dev.txt b/requirements36-dev.txt index b497f456..c680ba33 100644 --- a/requirements36-dev.txt +++ b/requirements36-dev.txt @@ -1,4 +1,3 @@ pytest-asyncio tornado -aiohttp -flake8 \ No newline at end of file +aiohttp \ No newline at end of file From 19c2e84a6c6f89523756d4b87db718de3c449cd2 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 15 Nov 2016 15:00:39 -0800 Subject: [PATCH 416/468] update pam signature --- tests/unit/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index d17fb6f9..7d4620bc 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -75,4 +75,4 @@ def test_sign_sha_256(self): channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.2&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) - assert "3P7WMijA_gF3mVRq4hUxmzmAl3sm4d_Hgpz2gQW9NrY=" == result + assert "ty5TgZtcl-wWkdNCbW--IHg_DPG7ryhfqxJnZhjmhD8=" == result From 966b53f2b37350e98c60af8d548e5be060479a98 Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Wed, 16 Nov 2016 17:35:56 +0100 Subject: [PATCH 417/468] Added #should_replicate method --- pubnub/endpoints/pubsub/publish.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 52d73981..0dcddf61 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -17,6 +17,7 @@ def __init__(self, pubnub): self._channel = None self._message = None self._should_store = None + self._should_replicate = None self._use_post = None self._meta = None @@ -32,6 +33,10 @@ def use_post(self, use_post): self._use_post = bool(use_post) return self + def should_replicate(self, should_replicate): + self._should_replicate = bool(should_replicate) + return self + def should_store(self, should_store): self._should_store = bool(should_store) return self @@ -62,6 +67,11 @@ def custom_params(self): else: params["store"] = "0" + if self._should_replicate is not None: + if self._should_replicate: + params["replicate"] = "1" + else: + params["replicate"] = "0" # REVIEW: should auth key be assigned here? if self.pubnub.config.auth_key is not None: params["auth"] = utils.url_encode(self.pubnub.config.auth_key) From f68bf753fdf722e4032e480a6b4411ee6ac5e63f Mon Sep 17 00:00:00 2001 From: Tomasz Weissbek Date: Wed, 16 Nov 2016 18:24:10 +0100 Subject: [PATCH 418/468] Renamed should_replicate to replicate --- pubnub/endpoints/pubsub/publish.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 0dcddf61..10fe21c4 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -17,7 +17,7 @@ def __init__(self, pubnub): self._channel = None self._message = None self._should_store = None - self._should_replicate = None + self._replicate = None self._use_post = None self._meta = None @@ -33,8 +33,8 @@ def use_post(self, use_post): self._use_post = bool(use_post) return self - def should_replicate(self, should_replicate): - self._should_replicate = bool(should_replicate) + def replicate(self, replicate): + self._replicate = bool(replicate) return self def should_store(self, should_store): @@ -67,8 +67,8 @@ def custom_params(self): else: params["store"] = "0" - if self._should_replicate is not None: - if self._should_replicate: + if self._replicate is not None: + if self._replicate: params["replicate"] = "1" else: params["replicate"] = "0" From 0f8fbe78aecb57cffc8c25a433cd7855ea19fa89 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Fri, 25 Nov 2016 08:16:57 -0800 Subject: [PATCH 419/468] Add __str__() method to results --- pubnub/models/consumer/access_manager.py | 8 ++- pubnub/models/consumer/channel_group.py | 12 +++- pubnub/models/consumer/history.py | 6 ++ pubnub/models/consumer/presence.py | 19 +++++ pubnub/models/consumer/pubsub.py | 3 + pubnub/models/consumer/push.py | 13 +++- tests/functional/test_stringify.py | 92 ++++++++++++++++++++++++ 7 files changed, 145 insertions(+), 8 deletions(-) create mode 100644 tests/functional/test_stringify.py diff --git a/pubnub/models/consumer/access_manager.py b/pubnub/models/consumer/access_manager.py index 810dab21..470cfb1f 100644 --- a/pubnub/models/consumer/access_manager.py +++ b/pubnub/models/consumer/access_manager.py @@ -79,11 +79,15 @@ def from_json(cls, json_input): class PNAccessManagerAuditResult(_PAMResult): - pass + def __str__(self): + return "Current permissions are valid for %d minutes: read %s, write %s, manage: %s" % \ + (self.ttl or 0, self.read_enabled, self.write_enabled, self.manage_enabled) class PNAccessManagerGrantResult(_PAMResult): - pass + def __str__(self): + return "New permissions are set for %d minutes: read %s, write %s, manage: %s" % \ + (self.ttl or 0, self.read_enabled, self.write_enabled, self.manage_enabled) class _PAMEntityData(object): diff --git a/pubnub/models/consumer/channel_group.py b/pubnub/models/consumer/channel_group.py index 79011baa..f4e23e82 100644 --- a/pubnub/models/consumer/channel_group.py +++ b/pubnub/models/consumer/channel_group.py @@ -1,15 +1,21 @@ class PNChannelGroupsAddChannelResult(object): - pass + def __str__(self): + return "Channel successfully added" class PNChannelGroupsRemoveChannelResult(object): - pass + def __str__(self): + return "Channel successfully removed" class PNChannelGroupsRemoveGroupResult(object): - pass + def __str__(self): + return "Group successfully removed" class PNChannelGroupsListResult(object): def __init__(self, channels): self.channels = channels + + def __str__(self): + return "Group contains following channels: %s" % ", ".join(self.channels) diff --git a/pubnub/models/consumer/history.py b/pubnub/models/consumer/history.py index 3e3f218b..bf6deff5 100644 --- a/pubnub/models/consumer/history.py +++ b/pubnub/models/consumer/history.py @@ -7,6 +7,9 @@ def __init__(self, messages, start_timetoken, end_timetoken): self.start_timetoken = start_timetoken self.end_timetoken = end_timetoken + def __str__(self): + return "History result for range %d..%d" % (self.start_timetoken, self.end_timetoken) + @classmethod def from_json(cls, json_input, include_tt_option=False, cipher=None): start_timetoken = json_input[1] @@ -38,5 +41,8 @@ def __init__(self, entry, timetoken=None): self.timetoken = timetoken self.entry = entry + def __str__(self): + return "History item with tt: %s and content: %s" % (self.timetoken, self.entry) + def decrypt(self, cipher_key): self.entry = pn_crypto.decrypt(cipher_key, self.entry) diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index 55c981dc..664d47e4 100644 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -10,6 +10,9 @@ def __init__(self, total_channels, total_occupancy, channels): self.total_occupancy = total_occupancy self.channels = channels + def __str__(self): + return "HereNow Result total occupancy: %d, total channels: %d" % (self.total_occupancy, self.total_channels) + @classmethod def from_json(cls, envelope, channel_names): # multiple @@ -81,6 +84,10 @@ def __init__(self, channel_name, occupancy, occupants): self.occupancy = occupancy self.occupants = occupants + def __str__(self): + return "HereNow Channel Data for channel '%s': occupancy: %d, occupants: %d" \ + % (self.channel_name, self.occupancy, self.occupants) + @classmethod def from_json(cls, name, json_input): if 'uuids' in json_input: @@ -108,12 +115,18 @@ def __init__(self, uuid, state): self.uuid = uuid self.state = state + def __str__(self): + return "HereNow Occupants Data for '%s': %s" % (self.uuid, self.state) + class PNWhereNowResult(object): def __init__(self, channels): assert isinstance(channels, (list, tuple)) self.channels = channels + def __str__(self): + return "User is currently subscribed to %s" % ", ".join(self.channels) + @classmethod def from_json(cls, json_input): return PNWhereNowResult(json_input['payload']['channels']) @@ -124,8 +137,14 @@ def __init__(self, state): assert isinstance(state, dict) self.state = state + def __str__(self): + return "New state %s successfully set" % self.state + class PNGetStateResult(object): def __init__(self, channels): assert isinstance(channels, dict) self.channels = channels + + def __str__(self): + return "Current state is %s" % self.channels diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index 89e0d648..ba30bc91 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -73,3 +73,6 @@ def __init__(self, envelope, timetoken): :param timetoken: of publish operation """ self.timetoken = timetoken + + def __str__(self): + return "Publish success with timetoken %s" % self.timetoken diff --git a/pubnub/models/consumer/push.py b/pubnub/models/consumer/push.py index 9c840fa8..08a17ad1 100644 --- a/pubnub/models/consumer/push.py +++ b/pubnub/models/consumer/push.py @@ -1,16 +1,23 @@ class PNPushAddChannelResult(object): - pass + def __str__(self): + return "Channel successfully added" class PNPushRemoveChannelResult(object): - pass + def __str__(self): + return "Channel successfully removed" class PNPushRemoveAllChannelsResult(object): - pass + def __str__(self): + return "All channels successfully removed" class PNPushListProvisionsResult(object): def __init__(self, channels): self.channels = channels + + def __str__(self): + return "Push notification enabled on following channels: %s" % \ + ", ".join(self.channels) diff --git a/tests/functional/test_stringify.py b/tests/functional/test_stringify.py new file mode 100644 index 00000000..c4323164 --- /dev/null +++ b/tests/functional/test_stringify.py @@ -0,0 +1,92 @@ +import unittest + +from pubnub.models.consumer.access_manager import PNAccessManagerAuditResult, PNAccessManagerGrantResult +from pubnub.models.consumer.channel_group import PNChannelGroupsListResult, PNChannelGroupsAddChannelResult, \ + PNChannelGroupsRemoveGroupResult, PNChannelGroupsRemoveChannelResult +from pubnub.models.consumer.history import PNHistoryResult, PNHistoryItemResult +from pubnub.models.consumer.presence import PNHereNowResult, PNHereNowChannelData, PNHereNowOccupantsData, \ + PNWhereNowResult, PNSetStateResult, PNGetStateResult + +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.models.consumer.push import PNPushListProvisionsResult, PNPushAddChannelResult, PNPushRemoveChannelResult, \ + PNPushRemoveAllChannelsResult + + +class TestStringify(unittest.TestCase): + def test_publish(self): + assert str(PNPublishResult(None, 123123)) == "Publish success with timetoken 123123" + + def test_add_channel_to_group(self): + assert str(PNChannelGroupsAddChannelResult()) == "Channel successfully added" + + def test_remove_channel_from_group(self): + assert str(PNChannelGroupsRemoveChannelResult()) == "Channel successfully removed" + + def test_remove_channel_group(self): + assert str(PNChannelGroupsRemoveGroupResult()) == "Group successfully removed" + + def test_list_channel_group(self): + result = PNChannelGroupsListResult([ + 'qwer', + 'asdf', + 'zxcv' + ]) + + assert str(result) == "Group contains following channels: qwer, asdf, zxcv" + + def test_audit(self): + result = PNAccessManagerAuditResult(None, None, None, None, 3600, True, False, True) + + assert str(result) == "Current permissions are valid for 3600 minutes: read True, write False, manage: True" + + def test_grant(self): + result = PNAccessManagerGrantResult(None, None, None, None, 3600, True, False, True) + + assert str(result) == "New permissions are set for 3600 minutes: read True, write False, manage: True" + + def test_history(self): + assert str(PNHistoryResult(None, 123, 789)) == "History result for range 123..789" + + def test_history_item(self): + assert str(PNHistoryItemResult({'blah': 2}, 123)) == \ + "History item with tt: 123 and content: {'blah': 2}" + + assert str(PNHistoryItemResult({'blah': 2})) == \ + "History item with tt: None and content: {'blah': 2}" + + def test_here_now(self): + assert str(PNHereNowResult(7, 4, None)) == "HereNow Result total occupancy: 4, total channels: 7" + + def test_here_now_channel_data(self): + assert str(PNHereNowChannelData('blah', 5, 9)) == \ + "HereNow Channel Data for channel 'blah': occupancy: 5, occupants: 9" + + def test_here_now_occupants_data(self): + assert str(PNHereNowOccupantsData('myuuid', {'blah': 3})) == \ + "HereNow Occupants Data for 'myuuid': {'blah': 3}" + + def test_where_now(self): + assert str(PNWhereNowResult(['qwer', 'asdf'])) == \ + "User is currently subscribed to qwer, asdf" + + def test_set_state(self): + assert str(PNSetStateResult({})) == "New state {} successfully set" + + def test_get_state(self): + assert str(PNGetStateResult({})) == "Current state is {}" + + def test_push_list(self): + assert str(PNPushListProvisionsResult(['qwer', 'asdf'])) == \ + "Push notification enabled on following channels: qwer, asdf" + + def test_push_add(self): + assert str(PNPushAddChannelResult()) == \ + "Channel successfully added" + + def test_push_remove(self): + assert str(PNPushRemoveChannelResult()) == \ + "Channel successfully removed" + + def test_push_remove_all(self): + assert str(PNPushRemoveAllChannelsResult()) == \ + "All channels successfully removed" From 26d48227a5b9dfe12523ed14effa5e0911822b25 Mon Sep 17 00:00:00 2001 From: Rajat Kalsy Date: Tue, 29 Nov 2016 11:58:25 +0530 Subject: [PATCH 420/468] Update .pubnub.yml --- .pubnub.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.pubnub.yml b/.pubnub.yml index 5f1547ca..dfaaddec 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -59,4 +59,4 @@ features: - SUBSCRIBE-PRESENCE-CHANNELS-GROUPS - SUBSCRIBE-WITH-TIMETOKEN - SUBSCRIBE-WILDCARD - - SUBSCRIBE-SENDER-UUID + - SUBSCRIBE-PUBLISHER-UUID From 3552e95fc2c54c466265c45d9316c2e3aefa1014 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 19 Oct 2016 03:59:57 -0700 Subject: [PATCH 421/468] Add asyncio reconnection manager; Errors refactoring; Introduce result() endpoint --- pubnub/builders.py | 1 + pubnub/callbacks.py | 6 + pubnub/endpoints/endpoint.py | 31 +- pubnub/enums.py | 1 + pubnub/errors.py | 1 + pubnub/exceptions.py | 7 +- pubnub/managers.py | 28 +- pubnub/pubnub_asyncio.py | 273 ++++++++++++++---- pubnub/structures.py | 3 +- pubnub/utils.py | 5 + tests/integrational/asyncio/test_here_now.py | 13 +- .../integrational/asyncio/test_invocations.py | 103 +++++++ tests/integrational/asyncio/test_pam.py | 23 -- tests/integrational/asyncio/test_state.py | 6 +- tests/integrational/asyncio/test_subscribe.py | 30 +- tests/integrational/asyncio/test_time.py | 6 +- .../asyncio/test_unsubscribe_status.py | 83 ++++++ tests/integrational/asyncio/test_where_now.py | 14 +- .../asyncio/invocations/envelope.yaml | 15 + .../fixtures/asyncio/invocations/future.yaml | 15 + .../future_raises_pubnub_error.yaml | 20 ++ .../asyncio/subscription/join_leave.yaml | 103 ------- .../asyncio/subscription/sub_pub_unsub.yaml | 41 --- tests/integrational/vcr_asyncio_sleeper.py | 56 ++++ tests/manual/__init__.py | 0 tests/manual/asyncio/__init__.py | 0 tests/manual/asyncio/test_reconnections.py | 66 +++++ 27 files changed, 684 insertions(+), 266 deletions(-) create mode 100644 tests/integrational/asyncio/test_invocations.py create mode 100644 tests/integrational/asyncio/test_unsubscribe_status.py create mode 100644 tests/integrational/fixtures/asyncio/invocations/envelope.yaml create mode 100644 tests/integrational/fixtures/asyncio/invocations/future.yaml create mode 100644 tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml delete mode 100644 tests/integrational/fixtures/asyncio/subscription/join_leave.yaml delete mode 100644 tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml create mode 100644 tests/manual/__init__.py create mode 100644 tests/manual/asyncio/__init__.py create mode 100644 tests/manual/asyncio/test_reconnections.py diff --git a/pubnub/builders.py b/pubnub/builders.py index 60f205aa..d4a58e06 100644 --- a/pubnub/builders.py +++ b/pubnub/builders.py @@ -11,6 +11,7 @@ def __init__(self, subscription_manager): self._channel_subscriptions = [] self._channel_group_subscriptions = [] + # TODO: make the 'channel' alias def channels(self, channels_list): utils.extend_list(self._channel_subscriptions, channels_list) diff --git a/pubnub/callbacks.py b/pubnub/callbacks.py index 13a24794..f68153c5 100644 --- a/pubnub/callbacks.py +++ b/pubnub/callbacks.py @@ -21,3 +21,9 @@ def message(self, pubnub, message): @abstractmethod def presence(self, pubnub, presence): pass + + +class ReconnectionCallback(object): + @abstractmethod + def on_reconnect(self): + pass diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 22eba984..431f290a 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -83,6 +83,7 @@ def options(self): connect_timeout=self.connect_timeout(), create_response=self.create_response, create_status=self.create_status, + create_exception=self.create_exception, operation_type=self.operation_type(), data=self.build_data(), sort_arguments=self._sort_params) @@ -114,14 +115,21 @@ def callback_wrapper(envelope): # REVIEW: include self._cancellation_event into options? cancellation_event=self._cancellation_event) + def result(self): + def handler(): + self.validate_params() + return self.options() + + return self.pubnub.request_result(options_func=handler, + cancellation_event=self._cancellation_event) + def future(self): def handler(): self.validate_params() return self.options() return self.pubnub.request_future(options_func=handler, - cancellation_event=self._cancellation_event - ) + cancellation_event=self._cancellation_event) def deferred(self): def handler(): @@ -149,8 +157,8 @@ def callback(params_to_merge): operation_type = self.operation_type() if operation_type == PNOperationType.PNAccessManagerAudit: signed_input += 'audit\n' - elif operation_type == PNOperationType.PNAccessManagerGrant or\ - operation_type == PNOperationType.PNAccessManagerRevoke: + elif operation_type == PNOperationType.PNAccessManagerGrant or \ + operation_type == PNOperationType.PNAccessManagerRevoke: signed_input += 'grant\n' else: signed_input += self.build_path() + "\n" @@ -170,6 +178,7 @@ def callback(params_to_merge): custom_params['pnsdk'] = utils.url_encode(self.pubnub.sdk_name) return custom_params + return callback def validate_subscribe_key(self): @@ -221,3 +230,17 @@ def create_status(self, category, response, response_info, exception): pn_status.affected_channels_groups = self.affected_channels_groups() return pn_status + + """ Used by asyncio and tornado clients to build exceptions + + The only difference with create_status() method is that a status + is wrapped with an exception and also contains this exception inside + as 'status.error_data.exception' + """ + + def create_exception(self, category, response, response_info, exception): + status = self.create_status(category, response, response_info, exception) + + exception.status = status + + return exception diff --git a/pubnub/enums.py b/pubnub/enums.py index 04407d21..df7917ca 100644 --- a/pubnub/enums.py +++ b/pubnub/enums.py @@ -66,6 +66,7 @@ class PNHeartbeatNotificationOptions(object): class PNReconnectionPolicy(object): NONE = 1 LINEAR = 2 + EXPONENTIAL = 3 class PNPushType(object): diff --git a/pubnub/errors.py b/pubnub/errors.py index 9e7cef23..fb677338 100644 --- a/pubnub/errors.py +++ b/pubnub/errors.py @@ -1,5 +1,6 @@ PNERR_CLIENT_TIMEOUT = "Client Timeout" PNERR__TIMEOUT = "Timeout Occurred" +PNERR_REQUEST_CANCELLED = "HTTP Client Error" # TODO: clarify to not confuse with 4xx and 5xx http erros PNERR_HTTP_ERROR = "HTTP Error" PNERR_CONNECTION_ERROR = "Connection Error" diff --git a/pubnub/exceptions.py b/pubnub/exceptions.py index 44749d7d..bbfebe07 100644 --- a/pubnub/exceptions.py +++ b/pubnub/exceptions.py @@ -3,7 +3,7 @@ def __init__(self, errormsg="", status_code=0, pn_error=None, status=None): self._errormsg = errormsg self._status_code = status_code self._pn_error = pn_error - self._status = status + self.status = status if len(str(errormsg)) > 0 and int(status_code) > 0: msg = str(pn_error) + " (" + str(status_code) + "): " + str(errormsg) @@ -13,3 +13,8 @@ def __init__(self, errormsg="", status_code=0, pn_error=None, status=None): msg = str(pn_error) super(PubNubException, self).__init__(msg) + + @property + def _status(self): + raise DeprecationWarning + return self.status diff --git a/pubnub/managers.py b/pubnub/managers.py index bf9ae3bb..d2115b67 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -4,7 +4,7 @@ from .models.consumer.common import PNStatus from .models.server.subscribe import SubscribeEnvelope from .dtos import SubscribeOperation, UnsubscribeOperation -from .callbacks import SubscribeCallback +from .callbacks import SubscribeCallback, ReconnectionCallback from .models.subscription_item import SubscriptionItem @@ -48,6 +48,32 @@ def get_base_path(self): return "%s.%s" % (BasePathManager.DEFAULT_SUBDOMAIN, BasePathManager.DEFAULT_BASE_PATH) +class ReconnectionManager(object): + INTERVAL = 3 + MINEXPONENTIALBACKOFF = 1 + MAXEXPONENTIALBACKOFF = 32 + + def __init__(self, pubnub): + self._pubnub = pubnub + self._callback = None + self._timer = None + self._timer_interval = None + self._connection_errors = 1 + + def set_reconnection_listener(self, reconnection_callback): + assert isinstance(reconnection_callback, ReconnectionCallback) + self._callback = reconnection_callback + + @abstractmethod + def start_polling(self): + pass + + def _stop_heartbeat_timer(self): + if self._timer is not None: + self._timer.stop() + self._timer = None + + class StateManager(object): def __init__(self): self._channels = {} diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index bd7c4cf0..2376d010 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -6,17 +6,20 @@ import six from asyncio import Event, Queue, Semaphore + +from pubnub.models.consumer.common import PNStatus from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe from .pubnub_core import PubNubCore from .workers import SubscribeMessageWorker -from .managers import SubscriptionManager, PublishSequenceManager +from .managers import SubscriptionManager, PublishSequenceManager, ReconnectionManager from . import utils from .structures import ResponseInfo, RequestOptions -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType -from .callbacks import SubscribeCallback -from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType, PNReconnectionPolicy +from .callbacks import SubscribeCallback, ReconnectionCallback +from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED, PNERR_REQUEST_CANCELLED, \ + PNERR_CLIENT_TIMEOUT from .exceptions import PubNubException logger = logging.getLogger("pubnub") @@ -60,26 +63,55 @@ def sdk_platform(self): def request_sync(self, *args): raise NotImplementedError - def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event, custom_loop=None): - loop = self.event_loop - - if custom_loop is not None: - loop = custom_loop - - future = self.request_future(options_func=endpoint_call_options, - create_response=endpoint_call_options.create_response, - create_status_response=endpoint_call_options.create_status, - cancellation_event=cancellation_event - ) - - task = asyncio.ensure_future(future, loop=loop) - return task.add_done_callback(callback) - def request_deferred(self, *args): raise NotImplementedError + @asyncio.coroutine + def request_result(self, options_func, cancellation_event): + envelope = yield from self._request_helper(options_func, cancellation_event) + return envelope.result + @asyncio.coroutine def request_future(self, options_func, cancellation_event): + try: + res = yield from self._request_helper(options_func, cancellation_event) + return res + except PubNubException as e: + return PubNubAsyncioException( + result=None, + status=e.status + ) + except asyncio.TimeoutError: + return PubNubAsyncioException( + result=None, + status=options_func().create_status(PNStatusCategory.PNTimeoutCategory, + None, + None, + exception=PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT + )) + ) + except asyncio.CancelledError: + return PubNubAsyncioException( + result=None, + status=options_func().create_status(PNStatusCategory.PNCancelledCategory, + None, + None, + exception=PubNubException( + pn_error=PNERR_REQUEST_CANCELLED + )) + ) + except Exception as e: + return PubNubAsyncioException( + result=None, + status=options_func().create_status(PNStatusCategory.PNUnknownCategory, + None, + None, + e) + ) + + @asyncio.coroutine + def _request_helper(self, options_func, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -87,7 +119,8 @@ def request_future(self, options_func, cancellation_event): assert isinstance(options, RequestOptions) create_response = options.create_response - create_status_response = options.create_status + create_status = options.create_status + create_exception = options.create_exception params_to_merge_in = {} @@ -111,7 +144,7 @@ def request_future(self, options_func, cancellation_event): except (asyncio.TimeoutError, asyncio.CancelledError): raise except Exception as e: - logger.error("Request await error: %s" % str(e)) + logger.error("session.request exception: %s" % str(e)) raise body = yield from response.text() @@ -155,15 +188,14 @@ def request_future(self, options_func, cancellation_event): try: data = json.loads(body.decode("utf-8")) except ValueError: - raise PubNubAsyncioException( - result=create_response(None), - status=create_status_response(status_category, - response, - response_info, - PubNubException( - pn_error=PNERR_JSON_DECODING_FAILED, - errormsg='json decode error') - )) + raise create_exception(category=status_category, + response=response, + response_info=response_info, + exception=PubNubException( + pn_error=PNERR_JSON_DECODING_FAILED, + errormsg='json decode error', + ) + ) else: data = "N/A" @@ -181,19 +213,19 @@ def request_future(self, options_func, cancellation_event): if response.status == 400: status_category = PNStatusCategory.PNBadRequestCategory - raise PubNubAsyncioException( - result=data, - status=create_status_response(status_category, data, response_info, - PubNubException( - errormsg=data, - pn_error=err, - status_code=response.status - )) - ) + raise create_exception(category=status_category, + response=data, + response_info=response_info, + exception=PubNubException( + errormsg=data, + pn_error=err, + status_code=response.status + ) + ) else: return AsyncioEnvelope( result=create_response(data), - status=create_status_response( + status=create_status( PNStatusCategory.PNAcknowledgmentCategory, data, response_info, @@ -201,6 +233,48 @@ def request_future(self, options_func, cancellation_event): ) +class AsyncioReconnectionManager(ReconnectionManager): + def __init__(self, pubnub): + self._task = None + super(AsyncioReconnectionManager, self).__init__(pubnub) + + @asyncio.coroutine + def _register_heartbeat_timer(self): + while True: + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: + self._timer_interval = int(math.pow(2, self._connection_errors) - 1) + if self._timer_interval > self.MAXEXPONENTIALBACKOFF: + self._timer_interval = self.MINEXPONENTIALBACKOFF + self._connection_errors = 1 + logger.debug("timerInterval > MAXEXPONENTIALBACKOFF at: %s" % utils.datetime_now()) + elif self._timer_interval < 1: + self._timer_interval = self.MINEXPONENTIALBACKOFF + logger.debug("timerInterval = %d at: %s" % (self._timer_interval, utils.datetime_now())) + else: + self._timer_interval = self.INTERVAL + + yield from asyncio.sleep(self._timer_interval) + + logger.debug("reconnect loop at: %s" % utils.datetime_now()) + + try: + yield from self._pubnub.time().future() + self._connection_errors = 1 + self._callback.on_reconnect() + break + except Exception: + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: + logger.debug("reconnect interval increment at: %s" % utils.datetime_now()) + self._connection_errors += 1 + + def start_polling(self): + self._task = asyncio.ensure_future(self._register_heartbeat_timer()) + + def stop_polling(self): + if self._task is not None and not self._task.cancelled(): + self._task.cancel() + + class AsyncioPublishSequenceManager(PublishSequenceManager): def __init__(self, ioloop, provided_max_sequence): super(AsyncioPublishSequenceManager, self).__init__(provided_max_sequence) @@ -220,14 +294,32 @@ def get_next_sequence(self): class AsyncioSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): + subscription_manager = self + self._message_worker = None self._message_queue = Queue() self._subscription_lock = Semaphore(1) self._subscribe_loop_task = None self._heartbeat_periodic_callback = None + self._reconnection_manager = AsyncioReconnectionManager(pubnub_instance) + super(AsyncioSubscriptionManager, self).__init__(pubnub_instance) self._start_worker() + class AsyncioReconnectionCallback(ReconnectionCallback): + def on_reconnect(self): + subscription_manager.reconnect() + + pn_status = PNStatus() + pn_status.category = PNStatusCategory.PNReconnectedCategory + pn_status.error = False + + subscription_manager._subscription_status_announced = True + subscription_manager._listener_manager.announce_status(pn_status) + + self._reconnection_listener = AsyncioReconnectionCallback() + self._reconnection_manager.set_reconnection_listener(self._reconnection_listener) + def _set_consumer_event(self): if not self._message_worker.cancelled(): self._message_worker.cancel() @@ -243,12 +335,20 @@ def _start_worker(self): loop=self._pubnub.event_loop) def reconnect(self): + # TODO: method is synchronized in Java self._should_stop = False self._subscribe_loop_task = asyncio.ensure_future(self._start_subscribe_loop()) self._register_heartbeat_timer() + def disconnect(self): + # TODO: method is synchronized in Java + self._should_stop = True + self._stop_heartbeat_timer() + self._stop_subscribe_loop() + def stop(self): super(AsyncioSubscriptionManager, self).stop() + self._reconnection_manager.stop_polling() if self._subscribe_loop_task is not None and not self._subscribe_loop_task.cancelled(): self._subscribe_loop_task.cancel() @@ -262,39 +362,51 @@ def _start_subscribe_loop(self): combined_groups = self._subscription_state.prepare_channel_group_list(True) if len(combined_channels) == 0 and len(combined_groups) == 0: + self._subscription_lock.release() return - try: - self._subscribe_request_task = asyncio.ensure_future( - Subscribe(self._pubnub) + self._subscribe_request_task = asyncio.ensure_future( + Subscribe(self._pubnub) .channels(combined_channels) .channel_groups(combined_groups) .timetoken(self._timetoken).region(self._region) .filter_expression(self._pubnub.config.filter_expression) .future()) - envelope = yield from self._subscribe_request_task + e = yield from self._subscribe_request_task + + if self._subscribe_request_task.cancelled(): + self._subscription_lock.release() + return - if self._subscribe_request_task.cancelled(): + if e.is_error(): + if e.status is not None and e.status.category == PNStatusCategory.PNCancelledCategory: + self._subscription_lock.release() return - self._handle_endpoint_call(envelope.result, envelope.status) - self._subscribe_loop_task = asyncio.ensure_future(self._start_subscribe_loop()) - except PubNubAsyncioException as e: if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: self._pubnub.event_loop.call_soon(self._start_subscribe_loop) - elif e.status is not None and e.status.category == PNStatusCategory.PNAccessDeniedCategory: - e.status.operation = PNOperationType.PNUnsubscribeOperation - self._listener_manager.announce_status(e.status) - else: - self._listener_manager.announce_status(e.status) - except asyncio.CancelledError: - pass - except Exception as e: + self._subscription_lock.release() + return + logger.error("Exception in subscribe loop: %s" % str(e)) - raise - finally: + + if e.status is not None and e.status.category == PNStatusCategory.PNAccessDeniedCategory: + e.status.operation = PNOperationType.PNUnsubscribeOperation + + # TODO: raise error + self._listener_manager.announce_status(e.status) + + self._reconnection_manager.start_polling() + self._subscription_lock.release() + self.disconnect() + return + else: + self._handle_endpoint_call(e.result, e.status) self._subscription_lock.release() + self._subscribe_loop_task = asyncio.ensure_future(self._start_subscribe_loop()) + + self._subscription_lock.release() def _stop_subscribe_loop(self): if self._subscribe_request_task is not None and not self._subscribe_request_task.cancelled(): @@ -334,14 +446,14 @@ def _perform_heartbeat_loop(self): .channel_groups(presence_groups) .state(state_payload) .cancellation_event(cancellation_event) - .future()) + .result()) envelope = yield from heartbeat_call heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: @@ -436,6 +548,10 @@ def __init__(self, result, status): self.result = result self.status = status + @staticmethod + def is_error(): + return False + class PubNubAsyncioException(Exception): def __init__(self, result, status): @@ -445,6 +561,13 @@ def __init__(self, result, status): def __str__(self): return str(self.status.error_data.exception) + @staticmethod + def is_error(): + return True + + def value(self): + return self.status.error_data.exception + class SubscribeListener(SubscribeCallback): def __init__(self): @@ -453,12 +576,15 @@ def __init__(self): self.disconnected_event = Event() self.presence_queue = Queue() self.message_queue = Queue() + self.error_queue = Queue() def status(self, pubnub, status): if utils.is_subscribed_event(status) and not self.connected_event.is_set(): self.connected_event.set() elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): self.disconnected_event.set() + elif status.is_error(): + self.error_queue.put_nowait(status.error_data.exception) def message(self, pubnub, message): self.message_queue.put_nowait(message) @@ -466,17 +592,36 @@ def message(self, pubnub, message): def presence(self, pubnub, presence): self.presence_queue.put_nowait(presence) + @asyncio.coroutine + def _wait_for(self, coro): + scc_task = asyncio.ensure_future(coro) + err_task = asyncio.ensure_future(self.error_queue.get()) + + yield from asyncio.wait([ + scc_task, + err_task + ], return_when=asyncio.FIRST_COMPLETED) + + if err_task.done() and not scc_task.done(): + if not scc_task.cancelled(): + scc_task.cancel() + raise err_task.result() + else: + if not err_task.cancelled(): + err_task.cancel() + return scc_task.result() + @asyncio.coroutine def wait_for_connect(self): if not self.connected_event.is_set(): - yield from self.connected_event.wait() + yield from self._wait_for(self.connected_event.wait()) else: raise Exception("instance is already connected") @asyncio.coroutine def wait_for_disconnect(self): if not self.disconnected_event.is_set(): - yield from self.disconnected_event.wait() + yield from self._wait_for(self.disconnected_event.wait()) else: raise Exception("instance is already disconnected") @@ -485,7 +630,7 @@ def wait_for_message_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = yield from self.message_queue.get() + env = yield from self._wait_for(self.message_queue.get()) if env.channel in channel_names: return env else: @@ -498,7 +643,7 @@ def wait_for_presence_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = yield from self.presence_queue.get() + env = yield from self._wait_for(self.presence_queue.get()) if env.channel in channel_names: return env else: diff --git a/pubnub/structures.py b/pubnub/structures.py index d9c4f164..879e07e3 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -5,7 +5,7 @@ class RequestOptions(object): def __init__(self, path, params_callback, method, request_timeout, connect_timeout, create_response, - create_status, operation_type, data=None, sort_arguments=False): + create_status, create_exception, operation_type, data=None, sort_arguments=False): assert len(path) > 0 assert callable(params_callback) assert isinstance(method, six.integer_types) @@ -26,6 +26,7 @@ def __init__(self, path, params_callback, method, request_timeout, connect_timeo self.create_response = create_response self.create_status = create_status + self.create_exception = create_exception self.operation_type = operation_type def merge_params_in(self, params_to_merge_in): diff --git a/pubnub/utils.py b/pubnub/utils.py index 127eb617..d683ddea 100644 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -1,3 +1,4 @@ +import datetime import hmac import json import uuid as u @@ -163,3 +164,7 @@ def strip_right(text, suffix): return text return text[:len(text) - len(suffix)] + + +def datetime_now(): + return datetime.datetime.now().strftime("%I:%M%p on %B %d, %Y") diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index a03757f0..c59f27ce 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -2,21 +2,22 @@ import pytest from pubnub.models.consumer.presence import PNHereNowResult -from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from pubnub.pubnub_asyncio import PubNubAsyncio from tests.helper import pnconf_sub_copy, pnconf_pam_copy -from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_asyncio_sleeper import get_sleeper, VCR599Listener from tests.integrational.vcr_helper import pn_vcr @get_sleeper('tests/integrational/fixtures/asyncio/here_now/single_channel.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/single_channel.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/single_channel.yaml', + filter_query_parameters=['tr', 'uuid', 'pnsdk']) @pytest.mark.asyncio def test_single_channel(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub.config.uuid = 'test-here-now-asyncio-uuid1' ch = "test-here-now-asyncio-ch" - callback = SubscribeListener() + callback = VCR599Listener(1) pubnub.add_listener(callback) pubnub.subscribe().channels(ch).execute() @@ -60,7 +61,7 @@ def test_multiple_channels(event_loop, sleeper=asyncio.sleep): ch1 = "test-here-now-asyncio-ch1" ch2 = "test-here-now-asyncio-ch2" - callback = SubscribeListener() + callback = VCR599Listener(1) pubnub.add_listener(callback) pubnub.subscribe().channels([ch1, ch2]).execute() @@ -104,7 +105,7 @@ def test_global(event_loop, sleeper=asyncio.sleep): ch1 = "test-here-now-asyncio-ch1" ch2 = "test-here-now-asyncio-ch2" - callback = SubscribeListener() + callback = VCR599Listener(1) pubnub.add_listener(callback) pubnub.subscribe().channels([ch1, ch2]).execute() diff --git a/tests/integrational/asyncio/test_invocations.py b/tests/integrational/asyncio/test_invocations.py new file mode 100644 index 00000000..e626cfef --- /dev/null +++ b/tests/integrational/asyncio/test_invocations.py @@ -0,0 +1,103 @@ +import logging + +import asyncio +import pytest +import pubnub as pn + +from pubnub.exceptions import PubNubException +from pubnub.models.consumer.common import PNStatus +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException +from tests.helper import pnconf_copy, pnconf_enc_copy, gen_decrypt_func, pnconf_pam_copy +from tests.integrational.vcr_helper import pn_vcr + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch = "asyncio-int-publish" +corrupted_keys = pnconf_copy() +corrupted_keys.publish_key = "blah" +corrupted_keys.subscribe_key = "blah" + + +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/future.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_future(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + result = yield from pubnub.publish().message('hey').channel('blah').result() + assert isinstance(result, PNPublishResult) + + pubnub.stop() + + +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_future_raises_pubnub_error(event_loop): + pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) + + with pytest.raises(PubNubException) as exinfo: + yield from pubnub.publish().message('hey').channel('blah').result() + + assert 'Invalid Subscribe Key' in str(exinfo.value) + assert 400 == exinfo.value._status_code + + pubnub.stop() + + +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/future_raises_ll_error.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_future_raises_lower_level_error(event_loop): + pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) + + pubnub._connector.close() + + with pytest.raises(RuntimeError) as exinfo: + yield from pubnub.publish().message('hey').channel('blah').result() + + assert 'Session is closed' in str(exinfo.value) + + pubnub.stop() + + +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_envelope(event_loop): + pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) + envelope = yield from pubnub.publish().message('hey').channel('blah').future() + assert isinstance(envelope, AsyncioEnvelope) + assert not envelope.is_error() + + pubnub.stop() + + +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_envelope_raises(event_loop): + pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) + e = yield from pubnub.publish().message('hey').channel('blah').future() + assert isinstance(e, PubNubAsyncioException) + assert e.is_error() + assert 400 == e.value()._status_code + + pubnub.stop() + + +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope_raises_ll_error.yaml', + filter_query_parameters=['uuid', 'seqn']) +@pytest.mark.asyncio +def test_publish_envelope_raises(event_loop): + pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) + + pubnub._connector.close() + + e = yield from pubnub.publish().message('hey').channel('blah').future() + assert isinstance(e, PubNubAsyncioException) + assert e.is_error() + assert str(e.value()) == 'Session is closed' + + pubnub.stop() diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index c9ca2c7a..35158b73 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -354,26 +354,3 @@ def test_multiple_channel_groups_with_auth(event_loop): assert env.result.groups[gr2].auth_keys[auth].manage_enabled is False pubnub.stop() - - -# @pytest.mark.asyncio -# def test_sign_non_pam_request(event_loop): -# pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) -# pubnub.config.uuid = "my_uuid" -# gr1 = "test-pam-asyncio-cg1" -# gr2 = "test-pam-asyncio-cg2" -# -# env = (yield from pubnub.grant()\ -# .channels('blah')\ -# .read(True)\ -# .write(True)\ -# .future()) -# -# env = (yield from pubnub.publish() -# .message('hi') -# .channel('blah') -# .future()) -# -# print(env.result) -# -# pubnub.stop() diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index ea3b6f3a..c3f0ae7b 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -2,9 +2,9 @@ import pytest from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult -from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from pubnub.pubnub_asyncio import PubNubAsyncio from tests.helper import pnconf, pnconf_copy, pnconf_sub_copy, pnconf_pam_copy -from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_asyncio_sleeper import get_sleeper, VCR599Listener from tests.integrational.vcr_helper import pn_vcr @@ -51,7 +51,7 @@ def test_single_channel_with_subscription(event_loop, sleeper=asyncio.sleep): pubnub.config.uuid = 'test-state-asyncio-uuid' state = {"name": "Alex", "count": 5} - callback = SubscribeListener() + callback = VCR599Listener(1) pubnub.add_listener(callback) pubnub.subscribe().channels(ch).execute() diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index e70d5079..47d80e63 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -6,12 +6,16 @@ from pubnub.models.consumer.pubsub import PNMessageResult from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy -from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_asyncio_sleeper import get_sleeper, VCR599Listener, VCR599ReconnectionManager from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) +def patch_pubnub(pubnub): + pubnub._subscription_manager._reconnection_manager = VCR599ReconnectionManager(pubnub) + + @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml', filter_query_parameters=['uuid']) @pytest.mark.asyncio @@ -47,10 +51,14 @@ def test_subscribe_unsubscribe(event_loop): def test_subscribe_publish_unsubscribe(event_loop): pubnub_sub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_pub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + + patch_pubnub(pubnub_sub) + patch_pubnub(pubnub_pub) + pubnub_sub.config.uuid = 'test-subscribe-asyncio-uuid-sub' pubnub_pub.config.uuid = 'test-subscribe-asyncio-uuid-pub' - callback = SubscribeListener() + callback = VCR599Listener(1) channel = "test-subscribe-asyncio-ch" message = "hey" pubnub_sub.add_listener(callback) @@ -92,7 +100,7 @@ def test_encrypted_subscribe_publish_unsubscribe(event_loop): pubnub = PubNubAsyncio(pnconf_enc_sub_copy(), custom_event_loop=event_loop) pubnub.config.uuid = 'test-subscribe-asyncio-uuid' - callback = SubscribeListener() + callback = VCR599Listener(1) channel = "test-subscribe-asyncio-ch" message = "hey" pubnub.add_listener(callback) @@ -135,11 +143,14 @@ def test_join_leave(event_loop): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) pubnub_listener = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) + patch_pubnub(pubnub) + patch_pubnub(pubnub_listener) + pubnub.config.uuid = "test-subscribe-asyncio-messenger" pubnub_listener.config.uuid = "test-subscribe-asyncio-listener" - callback_presence = SubscribeListener() - callback_messages = SubscribeListener() + callback_presence = VCR599Listener(1) + callback_messages = VCR599Listener(1) pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channels(channel).with_presence().execute() @@ -164,6 +175,7 @@ def test_join_leave(event_loop): yield from callback_messages.wait_for_disconnect() envelope = yield from callback_presence.wait_for_presence_on(channel) + assert envelope.channel == channel assert envelope.event == 'leave' assert envelope.uuid == pubnub.uuid @@ -220,7 +232,7 @@ def test_cg_subscribe_publish_unsubscribe(event_loop, sleeper=asyncio.sleep): yield from sleeper(1) - callback_messages = SubscribeListener() + callback_messages = VCR599Listener(1) pubnub.add_listener(callback_messages) pubnub.subscribe().channel_groups(gr).execute() yield from callback_messages.wait_for_connect() @@ -266,8 +278,8 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): yield from sleeper(1) - callback_messages = SubscribeListener() - callback_presence = SubscribeListener() + callback_messages = VCR599Listener(1) + callback_presence = VCR599Listener(1) pubnub_listener.add_listener(callback_presence) pubnub_listener.subscribe().channel_groups(gr).with_presence().execute() @@ -346,7 +358,7 @@ def test_unsubscribe_all(event_loop, sleeper=asyncio.sleep): yield from sleeper(1) - callback_messages = SubscribeListener() + callback_messages = VCR599Listener(1) pubnub.add_listener(callback_messages) pubnub.subscribe().channels([ch1, ch2, ch3]).channel_groups([gr1, gr2]).execute() diff --git a/tests/integrational/asyncio/test_time.py b/tests/integrational/asyncio/test_time.py index 96585399..6fcb2944 100644 --- a/tests/integrational/asyncio/test_time.py +++ b/tests/integrational/asyncio/test_time.py @@ -13,9 +13,9 @@ def test_time(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) - env = yield from pubnub.time().future() + res = yield from pubnub.time().result() - assert int(env.result) > 0 - assert isinstance(env.result.date_time(), date) + assert int(res) > 0 + assert isinstance(res.date_time(), date) pubnub.stop() diff --git a/tests/integrational/asyncio/test_unsubscribe_status.py b/tests/integrational/asyncio/test_unsubscribe_status.py new file mode 100644 index 00000000..fdfab695 --- /dev/null +++ b/tests/integrational/asyncio/test_unsubscribe_status.py @@ -0,0 +1,83 @@ +import logging +import asyncio +import pytest +from pubnub.enums import PNOperationType, PNStatusCategory + +from pubnub.callbacks import SubscribeCallback + +import pubnub as pn + +from pubnub.models.consumer.pubsub import PNMessageResult +from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener +from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy, pnconf_pam_copy +from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_helper import pn_vcr + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +class AccessDeniedListener(SubscribeCallback): + def __init__(self): + self.access_denied_event = asyncio.Event() + + def message(self, pubnub, message): + pass + + def presence(self, pubnub, presence): + pass + + def status(self, pubnub, status): + if status.operation == PNOperationType.PNUnsubscribeOperation: + if status.category == PNStatusCategory.PNAccessDeniedCategory: + self.access_denied_event.set() + + +class ReconnectedListener(SubscribeCallback): + def __init__(self): + self.reconnected_event = asyncio.Event() + + def message(self, pubnub, message): + pass + + def presence(self, pubnub, presence): + pass + + def status(self, pubnub, status): + if status.operation == PNOperationType.PNUnsubscribeOperation: + if status.category == PNStatusCategory.PNReconnectedCategory: + self.reconnected_event.set() + + +@pytest.mark.asyncio +async def test_access_denied_unsubscribe_operation(event_loop): + channel = "not-permitted-channel" + pnconf = pnconf_pam_copy() + pnconf.secret_key = None + pnconf.enable_subscribe = True + + pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) + + callback = AccessDeniedListener() + pubnub.add_listener(callback) + + pubnub.subscribe().channels(channel).execute() + await callback.access_denied_event.wait() + + pubnub.stop() + +# +# @pytest.mark.asyncio +# async def test_reconnected_unsubscribe_operation(event_loop): +# channel = "not-permitted-channel" +# pnconf = pnconf_pam_copy() +# pnconf.enable_subscribe = True +# +# pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) +# +# callback = ReconnectedListener() +# pubnub.add_listener(callback) +# +# pubnub.subscribe().channels(channel).execute() +# await callback.reconnected_event.wait() +# +# pubnub.stop() diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index 5adc5a8a..05a6cfac 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -2,9 +2,9 @@ import pytest from pubnub.models.consumer.presence import PNWhereNowResult -from pubnub.pubnub_asyncio import PubNubAsyncio, SubscribeListener +from pubnub.pubnub_asyncio import PubNubAsyncio from tests.helper import pnconf_sub_copy, pnconf_pam_copy -from tests.integrational.vcr_asyncio_sleeper import get_sleeper +from tests.integrational.vcr_asyncio_sleeper import get_sleeper, VCR599Listener from tests.integrational.vcr_helper import pn_vcr @@ -19,7 +19,7 @@ def test_single_channel(event_loop, sleeper=asyncio.sleep): uuid = 'test-where-now-asyncio-uuid' pubnub.config.uuid = uuid - callback = SubscribeListener() + callback = VCR599Listener(1) pubnub.add_listener(callback) pubnub.subscribe().channels(ch).execute() @@ -60,7 +60,7 @@ def test_multiple_channels(event_loop, sleeper=asyncio.sleep): uuid = 'test-where-now-asyncio-uuid' pubnub.config.uuid = uuid - callback = SubscribeListener() + callback = VCR599Listener(1) pubnub.add_listener(callback) pubnub.subscribe().channels([ch1, ch2]).execute() @@ -91,9 +91,9 @@ def test_where_now_super_admin_call(event_loop): uuid = 'test-where-now-asyncio-uuid' pubnub.config.uuid = uuid - env = yield from pubnub.where_now() \ + res = yield from pubnub.where_now() \ .uuid(uuid) \ - .future() - assert isinstance(env.result, PNWhereNowResult) + .result() + assert isinstance(res, PNWhereNowResult) pubnub.stop() diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml new file mode 100644 index 00000000..2e07e3ce --- /dev/null +++ b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + response: + body: {string: '[1,"Sent","14792030079427935"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 15 Nov 2016 09:43:27 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=57a47161-25c9-4006-a2b2-e526ee37d086 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future.yaml b/tests/integrational/fixtures/asyncio/invocations/future.yaml new file mode 100644 index 00000000..19763a6b --- /dev/null +++ b/tests/integrational/fixtures/asyncio/invocations/future.yaml @@ -0,0 +1,15 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + response: + body: {string: '[1,"Sent","14792019101601180"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 15 Nov 2016 09:25:10 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?seqn=1&uuid=3d52ca9c-567e-44b7-8852-0e2489044d8f&pnsdk=PubNub-Python-Asyncio%2F4.0.1 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml new file mode 100644 index 00000000..a560a5a2 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml @@ -0,0 +1,20 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + method: GET + uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + response: + body: {string: '{"message":"Invalid Subscribe Key","error":true,"service":"Access + Manager","status":400} + +'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Tue, 15 Nov 2016 09:25:13 + GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} + status: {code: 400, message: Bad Request} + url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?seqn=1&uuid=6db97bfd-56e5-40c7-9bb3-aa62b4203124&pnsdk=PubNub-Python-Asyncio%2F4.0.1 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml deleted file mode 100644 index ff87f671..00000000 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ /dev/null @@ -1,103 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"t":{"t":"14713498789397698","r":3},"m":[]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"t":{"t":"14713511412634058","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511411661104","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": - "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-listener", - "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"t":{"t":"14713511412354502","r":12},"m":[]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": - "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", - "occupancy": 3},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"t":{"t":"14713511418815177","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511418422322","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": - "leave", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", - "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} - headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', - ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:01 GMT', SERVER: Pubnub Presence} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} - headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', - ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub Presence} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 -version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml deleted file mode 100644 index dcc926bb..00000000 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ /dev/null @@ -1,41 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-uuid-sub - response: - body: {string: '{"t":{"t":"14786823981211583","r":12},"m":[]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-uuid-sub -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=test-subscribe-asyncio-uuid-pub - response: - body: {string: '[1,"Sent","14786827442126245"]'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=test-subscribe-asyncio-uuid-pub -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] - method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub - response: - body: {string: '{"t":{"t":"14786827442166827","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14786827442126245","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub -version: 1 diff --git a/tests/integrational/vcr_asyncio_sleeper.py b/tests/integrational/vcr_asyncio_sleeper.py index 4cbf4ac2..0d5e4cde 100644 --- a/tests/integrational/vcr_asyncio_sleeper.py +++ b/tests/integrational/vcr_asyncio_sleeper.py @@ -3,6 +3,9 @@ """ import six +from pubnub.exceptions import PubNubException +from pubnub.pubnub_asyncio import SubscribeListener, AsyncioReconnectionManager + from tests.integrational.vcr_helper import pn_vcr @@ -27,3 +30,56 @@ def call(*args, event_loop=None): return call return decorate + + +class VCR599Listener(SubscribeListener): + """ + The wrapper for SubscribeListener. + + Provides option to ignore the certain amount of 599 VCR errors. + + 599 VCR errors can be undesirable raised in case when the request + was not recorded since it was in long-polling phase at the time when + the test was finished. + + This means if you use this listener you should determine the amount + of 599 errors can be raised by you own and explicitly pass it to constructor. + """ + + import asyncio + + def __init__(self, raise_times): + self.silent_limit = raise_times + self.raised_times = 0 + + super(VCR599Listener, self).__init__() + + @asyncio.coroutine + def _wait_for(self, coro): + try: + res = yield from super(VCR599Listener, self)._wait_for(coro) + return res + except PubNubException as e: + if 'HTTP Server Error (599)' in str(e): + self.raised_times += 1 + if self.raised_times > self.silent_limit: + raise e + else: + """ HACK: case assumes that this is a long-polling request that wasn't fulfilled + at the time when it was recorded. To simulate this a sleep method was used. + """ + import asyncio + # yield from asyncio.sleep(1000) + else: + raise + + +class VCR599ReconnectionManager(AsyncioReconnectionManager): + def __init__(self, pubnub): + super(VCR599ReconnectionManager, self).__init__(pubnub) + + def start_polling(self): + print(">>> Skip polling after 599 Error") + + def stop_polling(self): + pass diff --git a/tests/manual/__init__.py b/tests/manual/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/manual/asyncio/__init__.py b/tests/manual/asyncio/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/manual/asyncio/test_reconnections.py b/tests/manual/asyncio/test_reconnections.py new file mode 100644 index 00000000..5bc30969 --- /dev/null +++ b/tests/manual/asyncio/test_reconnections.py @@ -0,0 +1,66 @@ +import logging +import asyncio + +import aiohttp +import pytest +import pubnub as pn +from pubnub.callbacks import SubscribeCallback +from pubnub.enums import PNReconnectionPolicy + +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests.helper import pnconf_sub_copy + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +class MySubscribeCallback(SubscribeCallback): + def status(self, pubnub, status): + pass + + def message(self, pubnub, message): + pass + + def presence(self, pubnub, presence): + pass + + +@pytest.mark.asyncio +async def test_blah(): + pnconf = pnconf_sub_copy() + assert isinstance(pnconf, PNConfiguration) + pnconf.reconnect_policy = PNReconnectionPolicy.EXPONENTIAL + pubnub = PubNubAsyncio(pnconf) + time_until_open_again = 8 + + async def close_soon(): + await asyncio.sleep(2) + pubnub._connector.close() + print(">>> connection is broken") + + async def open_again(): + await asyncio.sleep(time_until_open_again) + pubnub.set_connector(aiohttp.TCPConnector(conn_timeout=pubnub.config.connect_timeout, verify_ssl=True)) + print(">>> connection is open again") + + async def countdown(): + asyncio.sleep(2) + opened = False + count = time_until_open_again + + while not opened: + print(">>> %ds to open again" % count) + count -= 1 + if count <= 0: + break + await asyncio.sleep(1) + + my_listener = MySubscribeCallback() + pubnub.add_listener(my_listener) + pubnub.subscribe().channels('blah').execute() + + asyncio.ensure_future(close_soon()) + asyncio.ensure_future(open_again()) + asyncio.ensure_future(countdown()) + + await asyncio.sleep(1000) From bfdfdfafa64d6cd9048fcbe30552296e3fb1abc4 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 29 Nov 2016 08:49:02 -0800 Subject: [PATCH 422/468] Update tests --- .../asyncio/invocations/envelope.yaml | 10 +- .../fixtures/asyncio/invocations/future.yaml | 10 +- .../future_raises_pubnub_error.yaml | 8 +- .../asyncio/subscription/cg_join_leave.yaml | 82 +++++++------- .../subscription/cg_sub_pub_unsub.yaml | 42 +++---- .../asyncio/subscription/cg_sub_unsub.yaml | 26 ++--- .../asyncio/subscription/join_leave.yaml | 103 ++++++++++++++++++ .../asyncio/subscription/sub_pub_unsub.yaml | 56 ++++++++++ .../subscription/sub_pub_unsub_enc.yaml | 26 ++--- .../asyncio/subscription/sub_unsub.yaml | 14 +-- .../asyncio/subscription/unsubscribe_all.yaml | 40 +++---- 11 files changed, 288 insertions(+), 129 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/subscription/join_leave.yaml create mode 100644 tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml index 2e07e3ce..48aa9cef 100644 --- a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: - body: {string: '[1,"Sent","14792030079427935"]'} + body: {string: '[1,"Sent","14804380609205757"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 15 Nov 2016 09:43:27 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:47:40 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1&seqn=1&uuid=57a47161-25c9-4006-a2b2-e526ee37d086 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=0634b345-da4b-4d16-81d1-5ddd1ec00f4a version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future.yaml b/tests/integrational/fixtures/asyncio/invocations/future.yaml index 19763a6b..817c8b55 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: - body: {string: '[1,"Sent","14792019101601180"]'} + body: {string: '[1,"Sent","14804380577446754"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 15 Nov 2016 09:25:10 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:47:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?seqn=1&uuid=3d52ca9c-567e-44b7-8852-0e2489044d8f&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=741ff192-3454-4724-9b84-af2bbf383720 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml index a560a5a2..cccf306a 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.1] + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.1 + uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"message":"Invalid Subscribe Key","error":true,"service":"Access Manager","status":400} @@ -13,8 +13,8 @@ interactions: headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Tue, 15 Nov 2016 09:25:13 + CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Tue, 29 Nov 2016 16:47:40 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} status: {code: 400, message: Bad Request} - url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?seqn=1&uuid=6db97bfd-56e5-40c7-9bb3-aa62b4203124&pnsdk=PubNub-Python-Asyncio%2F4.0.1 + url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=9cddca6b-9529-453e-b1ee-b1b9eedb21ce version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index 769d2dfe..cd439da6 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -10,7 +10,7 @@ interactions: "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:07 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 @@ -19,115 +19,115 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres response: - body: {string: '{"t":{"t":"14713511480343359","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14804381218848996","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:41 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511480343359 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381218848996&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres response: - body: {string: '{"t":{"t":"14713511489324977","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511488470095","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": - "join", "timestamp": 1471351148, "uuid": "test-subscribe-asyncio-listener", + body: {string: '{"t":{"t":"14804381228739104","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381227916797","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "join", "timestamp": 1480438122, "uuid": "test-subscribe-asyncio-listener", "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:42 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511480343359 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381218848996&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group response: - body: {string: '{"t":{"t":"14713511488599816","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14804381228085803","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:42 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511489324977 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381228739104&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres response: - body: {string: '{"t":{"t":"14713511498339636","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511497874401","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": - "join", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", + body: {string: '{"t":{"t":"14804381239018013","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381238546954","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "join", "timestamp": 1480438123, "uuid": "test-subscribe-asyncio-messenger", "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:09 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:43 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511489324977 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381228739104&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381239018013&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} - headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', - ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} + body: {string: '{"t":{"t":"14804381241719258","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381240847317","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "leave", "timestamp": 1480438124, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381239018013&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511498339636 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group response: - body: {string: '{"t":{"t":"14713511502190714","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511499971846","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": - "leave", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", - "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT'} + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511498339636 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} + 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-join-leave-cg-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-join-leave-cg-channel version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 2d39a967..5a8654e6 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -4,83 +4,83 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:39 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=61a0f363-4410-49e0-a39c-d2c434fa3bf2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: - body: {string: '{"t":{"t":"14713511466073676","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14804381203881897","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=61a0f363-4410-49e0-a39c-d2c434fa3bf2&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 response: - body: {string: '[1,"Sent","14713511467409673"]'} + body: {string: '[1,"Sent","14804381205540482"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=61a0f363-4410-49e0-a39c-d2c434fa3bf2&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511466073676 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14804381203881897 response: - body: {string: '{"t":{"t":"14713511467422512","r":12},"m":[{"a":"2","f":0,"i":"f73c5107-519c-42fd-b1e1-7f9377430082","s":1,"p":{"t":"14713511467409673","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} + body: {string: '{"t":{"t":"14804381205566384","r":12},"m":[{"a":"2","f":0,"i":"61a0f363-4410-49e0-a39c-d2c434fa3bf2","s":1,"p":{"t":"14804381205540482","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511466073676 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&tt=14804381203881897&uuid=61a0f363-4410-49e0-a39c-d2c434fa3bf2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub Presence} + 29 Nov 2016 16:48:40 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=61a0f363-4410-49e0-a39c-d2c434fa3bf2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=61a0f363-4410-49e0-a39c-d2c434fa3bf2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-channel version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 66972ef3..25ebbcad 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -4,57 +4,57 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:35 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=16cbee70-d567-4340-9cc0-08e42ee7c202&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: - body: {string: '{"t":{"t":"14713511453005433","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14804381189328753","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:39 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=16cbee70-d567-4340-9cc0-08e42ee7c202&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub Presence} + 29 Nov 2016 16:48:39 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=16cbee70-d567-4340-9cc0-08e42ee7c202&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:39 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=16cbee70-d567-4340-9cc0-08e42ee7c202&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-channel version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml new file mode 100644 index 00000000..db0cd046 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -0,0 +1,103 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"t":{"t":"14804381132074397","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:33 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14804381132074397&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"t":{"t":"14804381141119432","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381140551040","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "join", "timestamp": 1480438114, "uuid": "test-subscribe-asyncio-listener", + "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:34 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14804381132074397&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"t":{"t":"14804381140699396","r":12},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:34 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14804381141119432&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"t":{"t":"14804381152084812","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381149869623","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "join", "timestamp": 1480438114, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:35 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14804381141119432&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 29 Nov 2016 16:48:35 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14804381152084812&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"t":{"t":"14804381154717522","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381154234285","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "leave", "timestamp": 1480438115, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '354', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:35 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14804381152084812&uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 29 Nov 2016 16:48:35 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml new file mode 100644 index 00000000..74e2e565 --- /dev/null +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -0,0 +1,56 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid-sub&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"t":{"t":"14804365171764948","r":3},"m":[]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid-sub&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid-pub&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 + response: + body: {string: '[1,"Sent","14804367695440930"]'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?uuid=test-subscribe-asyncio-uuid-pub&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=14804365171764948&uuid=test-subscribe-asyncio-uuid-sub&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=3 + response: + body: {string: '{"t":{"t":"14804367695447711","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14804367695440930","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} + headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=14804365171764948&uuid=test-subscribe-asyncio-uuid-sub&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=3 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid-sub&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 29 Nov 2016 16:26:09 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid-sub&pnsdk=PubNub-Python-Asyncio%2F4.0.2 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index 110cc1d9..02c5bec9 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -4,40 +4,40 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: - body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14804367695447711","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 response: - body: {string: '[1,"Sent","14713511404390559"]'} + body: {string: '[1,"Sent","14804367698742741"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=14804367695447711&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=3 response: - body: {string: '{"t":{"t":"14713511404397571","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511404390559","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} + body: {string: '{"t":{"t":"14804367698711870","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14804367698742741","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=14804367695447711&uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=3 - request: body: null headers: @@ -50,7 +50,7 @@ interactions: headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} + 29 Nov 2016 16:26:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index 21ab15e0..3fce1f6a 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -4,27 +4,27 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 response: - body: {string: '{"t":{"t":"14713511396585426","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14804365171764948","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=f9de0cea-10a8-4a29-b4e9-eb5e5354bc2e&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 12:38:59 GMT', SERVER: Pubnub Presence} + 29 Nov 2016 16:26:09 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=f9de0cea-10a8-4a29-b4e9-eb5e5354bc2e&pnsdk=PubNub-Python-Asyncio%2F4.0.2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index a1fe37f5..be620de8 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -4,87 +4,87 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch2/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2 response: - body: {string: '{"t":{"t":"14742262356649203","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14804381257627685","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:15 GMT'} + charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch2/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch2/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, - 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, + 29 Nov 2016 16:48:46 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch2/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-unsubscribe-all-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:46 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-unsubscribe-all-ch - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-unsubscribe-all-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:46 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-subscribe-asyncio-unsubscribe-all-ch version: 1 From 19551c57cdc72f35eff353f7b4088d3f2d7bbbda Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 29 Nov 2016 08:56:38 -0800 Subject: [PATCH 423/468] Fix python 3.4 compatibility with asyncio --- tests/integrational/asyncio/test_unsubscribe_status.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integrational/asyncio/test_unsubscribe_status.py b/tests/integrational/asyncio/test_unsubscribe_status.py index fdfab695..0bf84540 100644 --- a/tests/integrational/asyncio/test_unsubscribe_status.py +++ b/tests/integrational/asyncio/test_unsubscribe_status.py @@ -49,7 +49,7 @@ def status(self, pubnub, status): @pytest.mark.asyncio -async def test_access_denied_unsubscribe_operation(event_loop): +def test_access_denied_unsubscribe_operation(event_loop): channel = "not-permitted-channel" pnconf = pnconf_pam_copy() pnconf.secret_key = None @@ -61,7 +61,7 @@ async def test_access_denied_unsubscribe_operation(event_loop): pubnub.add_listener(callback) pubnub.subscribe().channels(channel).execute() - await callback.access_denied_event.wait() + yield from callback.access_denied_event.wait() pubnub.stop() From 29079f005c5867eab6d151c0d1bb5080cdf01f63 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 1 Dec 2016 16:11:21 -0800 Subject: [PATCH 424/468] Introduce result() Tornado endpoint; Refactor errors --- pubnub/pubnub_tornado.py | 322 ++++++++++++++---- .../tornado/invocations/future_raises.yaml | 44 +++ .../tornado/invocations/result_raises.yaml | 44 +++ .../tornado/subscribe/join_leave.yaml | 226 ++++++------ .../integrational/tornado/test_invocations.py | 98 ++++++ tests/integrational/tornado/test_publish.py | 6 +- tests/integrational/tornado/test_subscribe.py | 14 +- tests/manual/tornado/__init__.py | 0 tests/manual/tornado/subscribe_stub.py | 56 +++ tests/manual/tornado/test_reconnections.py | 73 ++++ 10 files changed, 698 insertions(+), 185 deletions(-) create mode 100644 tests/integrational/fixtures/tornado/invocations/future_raises.yaml create mode 100644 tests/integrational/fixtures/tornado/invocations/result_raises.yaml create mode 100644 tests/integrational/tornado/test_invocations.py create mode 100644 tests/manual/tornado/__init__.py create mode 100644 tests/manual/tornado/subscribe_stub.py create mode 100644 tests/manual/tornado/test_reconnections.py diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 95bf3bc1..81440882 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -2,10 +2,13 @@ import logging import time import datetime + +import math import six import tornado.gen import tornado.httpclient import tornado.ioloop +from tornado import gen from tornado import ioloop from tornado import stack_context @@ -16,13 +19,15 @@ from tornado.simple_httpclient import SimpleAsyncHTTPClient from . import utils -from .callbacks import SubscribeCallback +from .models.consumer.common import PNStatus +from .callbacks import SubscribeCallback, ReconnectionCallback from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType -from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType, PNReconnectionPolicy +from .errors import PNERR_SERVER_ERROR, PNERR_CLIENT_ERROR, PNERR_JSON_DECODING_FAILED, PNERR_CLIENT_TIMEOUT, \ + PNERR_CONNECTION_ERROR from .exceptions import PubNubException -from .managers import SubscriptionManager, PublishSequenceManager +from .managers import SubscriptionManager, PublishSequenceManager, ReconnectionManager from .pubnub_core import PubNubCore from .structures import ResponseInfo from .workers import SubscribeMessageWorker @@ -84,7 +89,33 @@ def request_async(self, *args): def request_deferred(self, *args): raise NotImplementedError + @tornado.gen.coroutine + def request_result(self, options_func, cancellation_event): + try: + envelope = yield self._request_helper(options_func, cancellation_event) + raise tornado.gen.Return(envelope.result) + except PubNubTornadoException as e: + raise e.status.error_data.exception + + @tornado.gen.coroutine def request_future(self, options_func, cancellation_event): + try: + e = yield self._request_helper(options_func, cancellation_event) + except PubNubTornadoException as ex: + e = ex + except Exception as ex: + e = PubNubTornadoException( + result=None, + status=options_func().create_status(PNStatusCategory.PNUnknownCategory, + None, + None, + ex) + ) + + raise tornado.gen.Return(e) + + # REFACTOR: quickly adjusted to fit the new result() and future() endpoints + def _request_helper(self, options_func, cancellation_event): if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -146,16 +177,16 @@ def response_callback(response): if body is not None and len(body) > 0: try: data = json.loads(body) - except TypeError: + except (ValueError, TypeError): try: data = json.loads(body.decode("utf-8")) except ValueError: - tornado_result = TornadoEnvelope( + tornado_result = PubNubTornadoException( create_response(None), create_status_response(status_category, response, response_info, PubNubException( pn_error=PNERR_JSON_DECODING_FAILED, errormsg='json decode error') - )) + )) future.set_exception(tornado_result) return else: @@ -170,6 +201,12 @@ def response_callback(response): else: err = PNERR_CLIENT_ERROR + e = PubNubException( + errormsg=data, + pn_error=err, + status_code=response.code, + ) + if response.code == 403: status_category = PNStatusCategory.PNAccessDeniedCategory @@ -177,16 +214,25 @@ def response_callback(response): status_category = PNStatusCategory.PNBadRequestCategory if response.code == 599: - status_category = PNStatusCategory.PNTimeoutCategory + if 'HTTP 599: Timeout during request' == data: + status_category = PNStatusCategory.PNTimeoutCategory + e = PubNubException( + pn_error=PNERR_CLIENT_TIMEOUT, + errormsg=str(e) + ) + elif 'HTTP 599: Stream closed' == data or\ + 'Name or service not known' in data or\ + 'Temporary failure in name resolution' in data: + status_category = PNStatusCategory.PNNetworkIssuesCategory + e = PubNubException( + pn_error=PNERR_CONNECTION_ERROR, + errormsg=str(e) + ) + # TODO: add check for other status codes future.set_exception(PubNubTornadoException( result=data, - status=create_status_response(status_category, data, response_info, - PubNubException( - errormsg=data, - pn_error=err, - status_code=response.code, - )) + status=create_status_response(status_category, data, response_info, e) )) else: future.set_result(TornadoEnvelope( @@ -206,6 +252,77 @@ def response_callback(response): return future +class TornadoReconnectionManager(ReconnectionManager): + def __init__(self, pubnub): + self._cancelled_event = Event() + super(TornadoReconnectionManager, self).__init__(pubnub) + + @gen.coroutine + def _register_heartbeat_timer(self): + self._cancelled_event.clear() + + while not self._cancelled_event.is_set(): + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: + self._timer_interval = int(math.pow(2, self._connection_errors) - 1) + if self._timer_interval > self.MAXEXPONENTIALBACKOFF: + self._timer_interval = self.MINEXPONENTIALBACKOFF + self._connection_errors = 1 + logger.debug("timerInterval > MAXEXPONENTIALBACKOFF at: %s" % utils.datetime_now()) + elif self._timer_interval < 1: + self._timer_interval = self.MINEXPONENTIALBACKOFF + logger.debug("timerInterval = %d at: %s" % (self._timer_interval, utils.datetime_now())) + else: + self._timer_interval = self.INTERVAL + + # >>> Wait given interval or cancel + sleeper = tornado.gen.sleep(self._timer_interval) + canceller = self._cancelled_event.wait() + + wi = tornado.gen.WaitIterator(canceller, sleeper) + + while not wi.done(): + try: + future = wi.next() + yield future + except Exception as e: + # TODO: verify the error will not be eaten + logger.error(e) + raise + else: + if wi.current_future == sleeper: + break + elif wi.current_future == canceller: + return + else: + raise Exception("unknown future raised") + + logger.debug("reconnect loop at: %s" % utils.datetime_now()) + + # >>> Attempt to request /time/0 endpoint + try: + yield self._pubnub.time().result() + self._connection_errors = 1 + self._callback.on_reconnect() + logger.debug("reconnection manager stop due success time endpoint call: %s" % utils.datetime_now()) + break + except Exception: + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: + logger.debug("reconnect interval increment at: %s" % utils.datetime_now()) + self._connection_errors += 1 + + def start_polling(self): + # TODO: add the same to asyncio + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.NONE: + logger.warn("reconnection policy is disabled, please handle reconnection manually.") + return + + self._pubnub.ioloop.spawn_callback(self._register_heartbeat_timer) + + def stop_polling(self): + if self._cancelled_event is not None and not self._cancelled_event.is_set(): + self._cancelled_event.set() + + class TornadoPublishSequenceManager(PublishSequenceManager): def __init__(self, provided_max_sequence): super(TornadoPublishSequenceManager, self).__init__(provided_max_sequence) @@ -242,15 +359,34 @@ def _take_message(self): class TornadoSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): + + subscription_manager = self + self._message_queue = Queue() self._consumer_event = Event() + self._cancellation_event = Event() self._subscription_lock = Semaphore(1) # self._current_request_key_object = None self._heartbeat_periodic_callback = None - self._cancellation_event = None + self._reconnection_manager = TornadoReconnectionManager(pubnub_instance) + super(TornadoSubscriptionManager, self).__init__(pubnub_instance) self._start_worker() + class TornadoReconnectionCallback(ReconnectionCallback): + def on_reconnect(self): + subscription_manager.reconnect() + + pn_status = PNStatus() + pn_status.category = PNStatusCategory.PNReconnectedCategory + pn_status.error = False + + subscription_manager._subscription_status_announced = True + subscription_manager._listener_manager.announce_status(pn_status) + + self._reconnection_listener = TornadoReconnectionCallback() + self._reconnection_manager.set_reconnection_listener(self._reconnection_listener) + def _set_consumer_event(self): self._consumer_event.set() @@ -267,65 +403,87 @@ def _start_worker(self): def reconnect(self): self._should_stop = False - self._pubnub.ioloop.add_callback(self._start_subscribe_loop) - self._register_heartbeat_timer() + self._pubnub.ioloop.spawn_callback(self._start_subscribe_loop) + # self._register_heartbeat_timer() + + def disconnect(self): + self._should_stop = True + self._stop_heartbeat_timer() + self._stop_subscribe_loop() @tornado.gen.coroutine def _start_subscribe_loop(self): - try: - self._stop_subscribe_loop() + self._stop_subscribe_loop() - yield self._subscription_lock.acquire() + yield self._subscription_lock.acquire() - self._cancellation_event = Event() + self._cancellation_event.clear() - combined_channels = self._subscription_state.prepare_channel_list(True) - combined_groups = self._subscription_state.prepare_channel_group_list(True) + combined_channels = self._subscription_state.prepare_channel_list(True) + combined_groups = self._subscription_state.prepare_channel_group_list(True) - if len(combined_channels) == 0 and len(combined_groups) == 0: - return + if len(combined_channels) == 0 and len(combined_groups) == 0: + return - envelope_future = Subscribe(self._pubnub) \ - .channels(combined_channels).channel_groups(combined_groups) \ - .timetoken(self._timetoken).region(self._region) \ - .filter_expression(self._pubnub.config.filter_expression) \ - .cancellation_event(self._cancellation_event) \ - .future() + envelope_future = Subscribe(self._pubnub) \ + .channels(combined_channels).channel_groups(combined_groups) \ + .timetoken(self._timetoken).region(self._region) \ + .filter_expression(self._pubnub.config.filter_expression) \ + .cancellation_event(self._cancellation_event) \ + .future() - wi = tornado.gen.WaitIterator( - envelope_future, - self._cancellation_event.wait()) + canceller_future = self._cancellation_event.wait() - while not wi.done(): - try: - result = yield wi.next() - except Exception as e: - logger.error(e) - raise - else: - if wi.current_future == envelope_future: - envelope = result - elif wi.current_future == self._cancellation_event.wait(): - break + wi = tornado.gen.WaitIterator(envelope_future, canceller_future) - self._handle_endpoint_call(envelope.result, envelope.status) - self._start_subscribe_loop() - except PubNubTornadoException as e: - if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: - self._pubnub.ioloop.add_callback(self._start_subscribe_loop) + # iterates 2 times: one for result one for cancelled + while not wi.done(): + try: + result = yield wi.next() + except Exception as e: + # TODO: verify the error will not be eaten + logger.error(e) + raise else: - self._listener_manager.announce_status(e.status) - except Exception as e: - logger.error(e) - raise - finally: - self._cancellation_event.set() - yield tornado.gen.moment - self._cancellation_event = None - self._subscription_lock.release() + if wi.current_future == envelope_future: + e = result + elif wi.current_future == canceller_future: + return + else: + raise Exception("Unexpected future resolved: %s" % str(wi.current_future)) + + if e.is_error(): + # 599 error doesn't works - tornado use this status code + # for a wide range of errors, for ex: + # HTTP Server Error (599): [Errno -2] Name or service not known + if e.status is not None and e.status.category == PNStatusCategory.PNTimeoutCategory: + self._pubnub.ioloop.spawn_callback(self._start_subscribe_loop) + return + + logger.error("Exception in subscribe loop: %s" % str(e)) + + if e.status is not None and e.status.category == PNStatusCategory.PNAccessDeniedCategory: + e.status.operation = PNOperationType.PNUnsubscribeOperation + + self._listener_manager.announce_status(e.status) + + self._reconnection_manager.start_polling() + self.disconnect() + return + else: + self._handle_endpoint_call(e.result, e.status) + + self._pubnub.ioloop.spawn_callback(self._start_subscribe_loop) + + finally: + self._cancellation_event.set() + yield tornado.gen.moment + self._subscription_lock.release() + self._cancellation_event.clear() + break def _stop_subscribe_loop(self): - if self._cancellation_event is not None: + if self._cancellation_event is not None and not self._cancellation_event.is_set(): self._cancellation_event.set() def _stop_heartbeat_timer(self): @@ -367,7 +525,7 @@ def _perform_heartbeat_loop(self): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: @@ -380,6 +538,8 @@ def _perform_heartbeat_loop(self): # self._start_subscribe_loop() # else: # self._listener_manager.announce_status(e.status) + except Exception as e: + print(e) finally: cancellation_event.set() @@ -396,6 +556,10 @@ def __init__(self, result, status): self.result = result self.status = status + @staticmethod + def is_error(): + return False + class PubNubTornadoException(Exception): def __init__(self, result, status): @@ -405,6 +569,13 @@ def __init__(self, result, status): def __str__(self): return str(self.status.error_data.exception) + @staticmethod + def is_error(): + return True + + def value(self): + return self.status.error_data.exception + class SubscribeListener(SubscribeCallback): def __init__(self): @@ -413,12 +584,15 @@ def __init__(self): self.disconnected_event = Event() self.presence_queue = Queue() self.message_queue = Queue() + self.error_queue = Queue() def status(self, pubnub, status): if utils.is_subscribed_event(status) and not self.connected_event.is_set(): self.connected_event.set() elif utils.is_unsubscribed_event(status) and not self.disconnected_event.is_set(): self.disconnected_event.set() + elif status.is_error(): + self.error_queue.put_nowait(status.error_data.exception) def message(self, pubnub, message): self.message_queue.put(message) @@ -426,17 +600,32 @@ def message(self, pubnub, message): def presence(self, pubnub, presence): self.presence_queue.put(presence) + @tornado.gen.coroutine + def _wait_for(self, coro): + error = self.error_queue.get() + wi = tornado.gen.WaitIterator(coro, error) + + while not wi.done(): + result = yield wi.next() + + if wi.current_future == coro: + raise gen.Return(result) + elif wi.current_future == error: + raise result + else: + raise Exception("Unexpected future resolved: %s" % str(wi.current_future)) + @tornado.gen.coroutine def wait_for_connect(self): if not self.connected_event.is_set(): - yield self.connected_event.wait() + yield self._wait_for(self.connected_event.wait()) else: raise Exception("instance is already connected") @tornado.gen.coroutine def wait_for_disconnect(self): if not self.disconnected_event.is_set(): - yield self.disconnected_event.wait() + yield self._wait_for(self.disconnected_event.wait()) else: raise Exception("instance is already disconnected") @@ -445,7 +634,7 @@ def wait_for_message_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = yield self.message_queue.get() + env = yield self._wait_for(self.message_queue.get()) if env.channel in channel_names: raise tornado.gen.Return(env) else: @@ -458,7 +647,10 @@ def wait_for_presence_on(self, *channel_names): channel_names = list(channel_names) while True: try: - env = yield self.presence_queue.get() + try: + env = yield self._wait_for(self.presence_queue.get()) + except: + break if env.channel in channel_names: raise tornado.gen.Return(env) else: diff --git a/tests/integrational/fixtures/tornado/invocations/future_raises.yaml b/tests/integrational/fixtures/tornado/invocations/future_raises.yaml new file mode 100644 index 00000000..dd14eef3 --- /dev/null +++ b/tests/integrational/fixtures/tornado/invocations/future_raises.yaml @@ -0,0 +1,44 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + response: + body: {string: !!python/unicode '{"message":"Invalid Subscribe Key","error":true,"service":"Access + Manager","status":400} + +'} + headers: + - !!python/tuple + - Access-Control-Allow-Headers + - ['Origin, X-Requested-With, Content-Type, Accept'] + - !!python/tuple + - Transfer-Encoding + - [chunked] + - !!python/tuple + - Server + - [nginx] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - ['no-cache, no-store, must-revalidate'] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:22:40 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset=UTF-8] + status: {code: 400, message: Bad Request} + url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1&uuid=3293317b-a598-4a4e-b54a-3fac8ae3f8d5 +version: 1 diff --git a/tests/integrational/fixtures/tornado/invocations/result_raises.yaml b/tests/integrational/fixtures/tornado/invocations/result_raises.yaml new file mode 100644 index 00000000..2d299a12 --- /dev/null +++ b/tests/integrational/fixtures/tornado/invocations/result_raises.yaml @@ -0,0 +1,44 @@ +interactions: +- request: + body: null + headers: + Accept-Encoding: [utf-8] + User-Agent: [PubNub-Python-Tornado/4.0.2] + method: GET + uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + response: + body: {string: !!python/unicode '{"message":"Invalid Subscribe Key","error":true,"service":"Access + Manager","status":400} + +'} + headers: + - !!python/tuple + - Access-Control-Allow-Headers + - ['Origin, X-Requested-With, Content-Type, Accept'] + - !!python/tuple + - Transfer-Encoding + - [chunked] + - !!python/tuple + - Server + - [nginx] + - !!python/tuple + - Connection + - [close] + - !!python/tuple + - Cache-Control + - ['no-cache, no-store, must-revalidate'] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:16:59 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset=UTF-8] + status: {code: 400, message: Bad Request} + url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1&uuid=189c0a7b-13b1-4d4c-a257-14fc2a124aaa +version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index 4258e4f0..f9fa067a 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -7,20 +7,20 @@ interactions: method: GET uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: - body: {string: '{"t":{"t":"14708438179383195","r":12},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818137719895494","r":12},"m":[]}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Content-Length - ['45'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:40 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -28,34 +28,34 @@ interactions: - Access-Control-Allow-Methods - [GET] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:48 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708438179383195 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14818137719895494 response: - body: {string: '{"t":{"t":"14708443090824007","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443089669538","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "join", "timestamp": 1470844308, "uuid": "subscribe-tornado-listener", "occupancy": + body: {string: !!python/unicode '{"t":{"t":"14818141038141353","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141037368243","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1481814103, "uuid": "subscribe-tornado-listener-3", "occupancy": 1},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Content-Length - - ['315'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - ['317'] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:43 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -63,10 +63,10 @@ interactions: - Access-Control-Allow-Methods - [GET] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:49 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818137719895494&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: @@ -75,20 +75,20 @@ interactions: method: GET uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 response: - body: {string: '{"t":{"t":"14708443090868294","r":12},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818141039599808","r":12},"m":[]}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Content-Length - ['45'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:44 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -96,34 +96,34 @@ interactions: - Access-Control-Allow-Methods - [GET] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:49 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443090824007 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14818141038141353 response: - body: {string: '{"t":{"t":"14708443098649253","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443097146633","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "join", "timestamp": 1470844309, "uuid": "subscribe-tornado-messenger", "occupancy": - 2},"b":"subscribe-tornado-ch-pnpres"}]}'} + body: {string: !!python/unicode '{"t":{"t":"14818141046316706","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141045847189","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1481814104, "uuid": "subscribe-tornado-messenger-3", + "occupancy": 2},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Content-Length - - ['316'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - ['318'] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:44 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -131,34 +131,34 @@ interactions: - Access-Control-Allow-Methods - [GET] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:49 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818141038141353&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443098649253 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14818141046316706 response: - body: {string: '{"t":{"t":"14708443101375638","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443100579978","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-messenger", "occupancy": - 1},"b":"subscribe-tornado-ch-pnpres"}]}'} + body: {string: !!python/unicode '{"t":{"t":"14818141050377882","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141049901227","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "leave", "timestamp": 1481814104, "uuid": "subscribe-tornado-messenger-3", + "occupancy": 1},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Content-Length - - ['317'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - ['319'] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:45 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -166,10 +166,10 @@ interactions: - Access-Control-Allow-Methods - [GET] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:50 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818141046316706&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: @@ -178,65 +178,65 @@ interactions: method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Accept-Ranges - - [bytes] - - !!python/tuple - - Age - - ['0'] - !!python/tuple - Content-Length - ['74'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - Server - [Pubnub Presence] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:45 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:50 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443101375638 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14818141050377882 response: - body: {string: '{"t":{"t":"14708443105516188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443104721390","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-listener", "occupancy": - 0},"b":"subscribe-tornado-ch-pnpres"}]}'} + body: {string: !!python/unicode '{"t":{"t":"14818141055223535","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141054743525","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "leave", "timestamp": 1481814105, "uuid": "subscribe-tornado-listener-3", + "occupancy": 0},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Content-Length - - ['316'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - ['318'] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:45 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -244,10 +244,10 @@ interactions: - Access-Control-Allow-Methods - [GET] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:50 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818141050377882&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: @@ -256,39 +256,39 @@ interactions: method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Accept-Ranges - - [bytes] - - !!python/tuple - - Age - - ['0'] - !!python/tuple - Content-Length - ['74'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - Server - [Pubnub Presence] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Thu, 15 Dec 2016 15:01:45 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:51:50 GMT'] + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-listener-3 version: 1 diff --git a/tests/integrational/tornado/test_invocations.py b/tests/integrational/tornado/test_invocations.py new file mode 100644 index 00000000..92bb2d7e --- /dev/null +++ b/tests/integrational/tornado/test_invocations.py @@ -0,0 +1,98 @@ +import logging +import pytest +import pubnub as pn +import tornado + +from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep + +pn.set_stream_logger('pubnub', logging.DEBUG) + +from tornado.testing import AsyncTestCase +from pubnub.exceptions import PubNubException +from pubnub.models.consumer.pubsub import PNPublishResult +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope, PubNubTornadoException +from tests.helper import pnconf_sub_copy + +corrupted_keys = PNConfiguration() +corrupted_keys.publish_key = "blah" +corrupted_keys.subscribe_key = "blah" + +pn.set_stream_logger('pubnub', logging.DEBUG) + +ch = "tornado-publish" + + +class TestPubNubTornadoInvocations(AsyncTestCase): + def setUp(self): + super(TestPubNubTornadoInvocations, self).setUp() + + @tornado.testing.gen_test + def test_publish_resultx(self): + pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + result = yield pubnub.publish().message('hey').channel('blah').result() + assert isinstance(result, PNPublishResult) + + pubnub.stop() + + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/invocations/result_raises.yaml', + filter_query_parameters=['uuid', 'seqn']) + @tornado.testing.gen_test + def test_publish_result_raises_pubnub_error(self): + pubnub = PubNubTornado(corrupted_keys, custom_ioloop=self.io_loop) + with pytest.raises(PubNubException) as exinfo: + yield pubnub.publish().message('hey').channel('blah').result() + + assert 'Invalid Subscribe Key' in str(exinfo.value) + assert 400 == exinfo.value._status_code + + pubnub.stop() + + @tornado.testing.gen_test + def test_publish_result_raises_lower_level_error(self): + pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + + # TODO: find a better way ot emulate broken connection + pubnub.http.close() + + with self.assertRaises(Exception) as context: + yield pubnub.publish().message('hey').channel('blah').result() + + assert 'fetch() called on closed AsyncHTTPClient' in str(context.exception.message) + + pubnub.stop() + + @tornado.testing.gen_test + def test_publish_futurex(self): + pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) + envelope = yield pubnub.publish().message('hey').channel('blah').future() + assert isinstance(envelope, TornadoEnvelope) + assert not envelope.is_error() + + pubnub.stop() + + @use_cassette_and_stub_time_sleep( + 'tests/integrational/fixtures/tornado/invocations/future_raises.yaml', + filter_query_parameters=['uuid', 'seqn']) + @tornado.testing.gen_test + def test_publish_future_raises(self): + pubnub = PubNubTornado(corrupted_keys, custom_ioloop=self.io_loop) + e = yield pubnub.publish().message('hey').channel('blah').future() + assert isinstance(e, PubNubTornadoException) + assert e.is_error() + assert 400 == e.value()._status_code + + pubnub.stop() + + @tornado.testing.gen_test + def test_publish_future_raises_lower_level_error(self): + pubnub = PubNubTornado(corrupted_keys, custom_ioloop=self.io_loop) + + pubnub.http.close() + + e = yield pubnub.publish().message('hey').channel('blah').future() + assert isinstance(e, PubNubTornadoException) + assert str(e) == "fetch() called on closed AsyncHTTPClient" + + pubnub.stop() diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index 77c6f3f5..fdfb48f6 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -182,7 +182,7 @@ def sserr_cb(self, env): def assert_server_side_error(self, pub, expected_err_msg): self.expected_err_msg = expected_err_msg - pub.future().add_done_callback(self.sserr_cb) + pub.result().add_done_callback(self.sserr_cb) self.pubnub.start() self.wait() @@ -191,11 +191,11 @@ def assert_server_side_error(self, pub, expected_err_msg): def assert_server_side_error_yield(self, pub, expected_err_msg): try: - yield pub.future() + yield pub.result() self.pubnub.start() self.wait() - except PubNubTornadoException as e: + except PubNubException as e: assert expected_err_msg in str(e) self.pubnub.stop() diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 115fb81b..e4c7ff5e 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -6,7 +6,7 @@ import pubnub as pn from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener -from tests.helper import pnconf_sub_copy +from tests.helper import pnconf_sub_copy, gen_string from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep pn.set_stream_logger('pubnub', logging.DEBUG) @@ -84,12 +84,18 @@ def test_subscribe_publish_unsubscribe(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/join_leave.yaml', filter_query_parameters=['uuid', 'seqn']) - @tornado.testing.gen_test(timeout=15) + @tornado.testing.gen_test(timeout=30) def test_join_leave(self): ch = "subscribe-tornado-ch" - self.pubnub.config.uuid = "subscribe-tornado-messenger" - self.pubnub_listener.config.uuid = "subscribe-tornado-listener" + # HINT: use random generated uuids to test without VCR + # rnd = gen_string(4) + # self.pubnub.config.uuid = "subscribe-tornado-messenger-%s" % rnd + # self.pubnub_listener.config.uuid = "subscribe-tornado-listener-%s" % rnd + + self.pubnub.config.uuid = "subscribe-tornado-messenger-3" + self.pubnub_listener.config.uuid = "subscribe-tornado-listener-3" + callback_presence = SubscribeListener() self.pubnub_listener.add_listener(callback_presence) self.pubnub_listener.subscribe().channels(ch).with_presence().execute() diff --git a/tests/manual/tornado/__init__.py b/tests/manual/tornado/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/manual/tornado/subscribe_stub.py b/tests/manual/tornado/subscribe_stub.py new file mode 100644 index 00000000..db84afc7 --- /dev/null +++ b/tests/manual/tornado/subscribe_stub.py @@ -0,0 +1,56 @@ +import time +import tornado + +from tornado import web +from tornado import gen + +# pn.set_stream_logger('pubnub', logging.DEBUG) + +ioloop = tornado.ioloop.IOLoop.current() + + +class SubscribeHandler(web.RequestHandler): + def timestamp(self): + return int(time.time() * 10000000) + + @gen.coroutine + def get(self): + tt = self.get_argument('tt') + + if tt is None: + raise gen.Return(self.send_error(500, message={ + "error": "Channel missing" + })) + + tt = int(tt) + + if tt > 0: + yield gen.sleep(5000) + + self.write('{"t":{"t":"%d","r":12},"m":[]}' % self.timestamp()) + + +class TimeHandler(web.RequestHandler): + def timestamp(self): + return int(time.time() * 10000000) + + @gen.coroutine + def get(self): + self.write('[%d]' % self.timestamp()) + + +def main(): + app = web.Application( + [ + (r"/v2/subscribe/demo/demo/0", SubscribeHandler), + (r"/time/0", TimeHandler), + ], + cookie_secret="__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__", + xsrf_cookies=True, + ) + app.listen(8089) + ioloop.start() + + +if __name__ == "__main__": + main() diff --git a/tests/manual/tornado/test_reconnections.py b/tests/manual/tornado/test_reconnections.py new file mode 100644 index 00000000..13699005 --- /dev/null +++ b/tests/manual/tornado/test_reconnections.py @@ -0,0 +1,73 @@ +import tornado +import logging +from tornado import gen +from tornado.testing import AsyncTestCase +import pubnub as pn + +from pubnub.callbacks import SubscribeCallback +from pubnub.enums import PNReconnectionPolicy +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_tornado import PubNubTornado + + +pn.set_stream_logger('pubnub', logging.DEBUG) + + +class MySubscribeCallback(SubscribeCallback): + def status(self, pubnub, status): + pass + + def message(self, pubnub, message): + pass + + def presence(self, pubnub, presence): + pass + + +class TestPubNubReconnection(AsyncTestCase): + """ + Tornado Reconnection Manager test design to be invoked alongside with 'subscribe_stub.py' + helper to start and drop a connection. + """ + @tornado.testing.gen_test(timeout=300) + def test_reconnection(self): + pnconf = PNConfiguration() + pnconf.publish_key = "demo" + pnconf.subscribe_key = "demo" + pnconf.origin = "localhost:8089" + pnconf.subscribe_request_timeout = 10 + pnconf.reconnect_policy = PNReconnectionPolicy.LINEAR + pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) + time_until_open_again = 10 + + @gen.coroutine + def close_soon(): + yield gen.sleep(3) + pubnub.http.close() + pubnub.http = None + print(">>> connection is broken") + + @gen.coroutine + def open_again(): + yield gen.sleep(time_until_open_again) + pubnub.http = tornado.httpclient.AsyncHTTPClient(max_clients=PubNubTornado.MAX_CLIENTS) + print(">>> connection is open again") + + @gen.coroutine + def countdown(): + yield gen.sleep(2) + opened = False + count = time_until_open_again + + while not opened: + print(">>> %ds to open again" % count) + count -= 1 + if count <= 0: + break + yield gen.sleep(1) + + my_listener = MySubscribeCallback() + pubnub.add_listener(my_listener) + pubnub.subscribe().channels('demo').execute() + + yield gen.sleep(1000) From 5e45991339f9c88257831aefd26d074abb2da8a7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 15 Dec 2016 08:34:03 -0800 Subject: [PATCH 425/468] Fix + sign encoding --- pubnub/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub/utils.py b/pubnub/utils.py index d683ddea..073c02cf 100644 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -34,9 +34,9 @@ def get_data_for_user(data): def write_value_as_string(data): try: if isinstance(data, six.string_types): - return ("\"%s\"" % data).replace("+", "%20") + return "\"%s\"" % data else: - return json.dumps(data).replace("+", "%20") + return json.dumps(data) except TypeError: raise PubNubException( pn_error=PNERR_JSON_NOT_SERIALIZABLE @@ -44,7 +44,7 @@ def write_value_as_string(data): def url_encode(data): - return six.moves.urllib.parse.quote(data, safe="") + return six.moves.urllib.parse.quote(data, safe="").replace("+", "%2B") def uuid(): From 1e22809a17becd0b6e6d0a8fc6766f84b9aae6aa Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 15 Dec 2016 10:10:44 -0800 Subject: [PATCH 426/468] Fix codestyle --- pubnub/endpoints/endpoint.py | 2 +- pubnub/pubnub_asyncio.py | 15 +++++++-------- pubnub/pubnub_tornado.py | 5 +++-- tests/functional/test_stringify.py | 18 +++++++++--------- .../integrational/asyncio/test_invocations.py | 7 ++----- .../asyncio/test_unsubscribe_status.py | 7 ++----- tests/integrational/tornado/test_publish.py | 2 +- tests/integrational/tornado/test_subscribe.py | 2 +- tests/integrational/vcr_asyncio_sleeper.py | 2 +- tests/manual/tornado/subscribe_stub.py | 4 ++-- 10 files changed, 29 insertions(+), 35 deletions(-) diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 431f290a..72d9a4cb 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -158,7 +158,7 @@ def callback(params_to_merge): if operation_type == PNOperationType.PNAccessManagerAudit: signed_input += 'audit\n' elif operation_type == PNOperationType.PNAccessManagerGrant or \ - operation_type == PNOperationType.PNAccessManagerRevoke: + operation_type == PNOperationType.PNAccessManagerRevoke: signed_input += 'grant\n' else: signed_input += self.build_path() + "\n" diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 2376d010..0e36c533 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -365,13 +365,12 @@ def _start_subscribe_loop(self): self._subscription_lock.release() return - self._subscribe_request_task = asyncio.ensure_future( - Subscribe(self._pubnub) - .channels(combined_channels) - .channel_groups(combined_groups) - .timetoken(self._timetoken).region(self._region) - .filter_expression(self._pubnub.config.filter_expression) - .future()) + self._subscribe_request_task = asyncio.ensure_future(Subscribe(self._pubnub) + .channels(combined_channels) + .channel_groups(combined_groups) + .timetoken(self._timetoken).region(self._region) + .filter_expression(self._pubnub.config.filter_expression) + .future()) e = yield from self._subscribe_request_task @@ -453,7 +452,7 @@ def _perform_heartbeat_loop(self): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index 81440882..e565ef92 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -186,7 +186,8 @@ def response_callback(response): create_status_response(status_category, response, response_info, PubNubException( pn_error=PNERR_JSON_DECODING_FAILED, errormsg='json decode error') - )) + ) + ) future.set_exception(tornado_result) return else: @@ -525,7 +526,7 @@ def _perform_heartbeat_loop(self): heartbeat_verbosity = self._pubnub.config.heartbeat_notification_options if envelope.status.is_error: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL or \ - heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: + heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: self._listener_manager.announce_stateus(envelope.status) else: if heartbeat_verbosity == PNHeartbeatNotificationOptions.ALL: diff --git a/tests/functional/test_stringify.py b/tests/functional/test_stringify.py index c4323164..b06043e6 100644 --- a/tests/functional/test_stringify.py +++ b/tests/functional/test_stringify.py @@ -49,25 +49,25 @@ def test_history(self): def test_history_item(self): assert str(PNHistoryItemResult({'blah': 2}, 123)) == \ - "History item with tt: 123 and content: {'blah': 2}" + "History item with tt: 123 and content: {'blah': 2}" assert str(PNHistoryItemResult({'blah': 2})) == \ - "History item with tt: None and content: {'blah': 2}" + "History item with tt: None and content: {'blah': 2}" def test_here_now(self): assert str(PNHereNowResult(7, 4, None)) == "HereNow Result total occupancy: 4, total channels: 7" def test_here_now_channel_data(self): assert str(PNHereNowChannelData('blah', 5, 9)) == \ - "HereNow Channel Data for channel 'blah': occupancy: 5, occupants: 9" + "HereNow Channel Data for channel 'blah': occupancy: 5, occupants: 9" def test_here_now_occupants_data(self): assert str(PNHereNowOccupantsData('myuuid', {'blah': 3})) == \ - "HereNow Occupants Data for 'myuuid': {'blah': 3}" + "HereNow Occupants Data for 'myuuid': {'blah': 3}" def test_where_now(self): assert str(PNWhereNowResult(['qwer', 'asdf'])) == \ - "User is currently subscribed to qwer, asdf" + "User is currently subscribed to qwer, asdf" def test_set_state(self): assert str(PNSetStateResult({})) == "New state {} successfully set" @@ -77,16 +77,16 @@ def test_get_state(self): def test_push_list(self): assert str(PNPushListProvisionsResult(['qwer', 'asdf'])) == \ - "Push notification enabled on following channels: qwer, asdf" + "Push notification enabled on following channels: qwer, asdf" def test_push_add(self): assert str(PNPushAddChannelResult()) == \ - "Channel successfully added" + "Channel successfully added" def test_push_remove(self): assert str(PNPushRemoveChannelResult()) == \ - "Channel successfully removed" + "Channel successfully removed" def test_push_remove_all(self): assert str(PNPushRemoveAllChannelsResult()) == \ - "All channels successfully removed" + "All channels successfully removed" diff --git a/tests/integrational/asyncio/test_invocations.py b/tests/integrational/asyncio/test_invocations.py index e626cfef..7f4df522 100644 --- a/tests/integrational/asyncio/test_invocations.py +++ b/tests/integrational/asyncio/test_invocations.py @@ -1,15 +1,12 @@ import logging -import asyncio import pytest import pubnub as pn from pubnub.exceptions import PubNubException -from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pubsub import PNPublishResult -from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException -from tests.helper import pnconf_copy, pnconf_enc_copy, gen_decrypt_func, pnconf_pam_copy +from tests.helper import pnconf_copy from tests.integrational.vcr_helper import pn_vcr pn.set_stream_logger('pubnub', logging.DEBUG) @@ -90,7 +87,7 @@ def test_publish_envelope_raises(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope_raises_ll_error.yaml', filter_query_parameters=['uuid', 'seqn']) @pytest.mark.asyncio -def test_publish_envelope_raises(event_loop): +def test_publish_envelope_raises_lower_level_error(event_loop): pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) pubnub._connector.close() diff --git a/tests/integrational/asyncio/test_unsubscribe_status.py b/tests/integrational/asyncio/test_unsubscribe_status.py index 0bf84540..768849e3 100644 --- a/tests/integrational/asyncio/test_unsubscribe_status.py +++ b/tests/integrational/asyncio/test_unsubscribe_status.py @@ -7,11 +7,8 @@ import pubnub as pn -from pubnub.models.consumer.pubsub import PNMessageResult -from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, SubscribeListener -from tests.helper import pnconf_sub_copy, pnconf_enc_sub_copy, pnconf_pam_copy -from tests.integrational.vcr_asyncio_sleeper import get_sleeper -from tests.integrational.vcr_helper import pn_vcr +from pubnub.pubnub_asyncio import PubNubAsyncio +from tests.helper import pnconf_pam_copy pn.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index fdfb48f6..e45e990d 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -9,7 +9,7 @@ from pubnub.models.consumer.common import PNStatus from pubnub.models.consumer.pubsub import PNPublishResult from pubnub.pnconfiguration import PNConfiguration -from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope, PubNubTornadoException +from pubnub.pubnub_tornado import PubNubTornado, TornadoEnvelope from tests.helper import pnconf, pnconf_enc, gen_decrypt_func, pnconf_pam_copy from tests.integrational.vcr_helper import pn_vcr diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index e4c7ff5e..83d3d44a 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -6,7 +6,7 @@ import pubnub as pn from pubnub.pubnub_tornado import PubNubTornado, SubscribeListener -from tests.helper import pnconf_sub_copy, gen_string +from tests.helper import pnconf_sub_copy from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep pn.set_stream_logger('pubnub', logging.DEBUG) diff --git a/tests/integrational/vcr_asyncio_sleeper.py b/tests/integrational/vcr_asyncio_sleeper.py index 0d5e4cde..0068f745 100644 --- a/tests/integrational/vcr_asyncio_sleeper.py +++ b/tests/integrational/vcr_asyncio_sleeper.py @@ -68,7 +68,7 @@ def _wait_for(self, coro): """ HACK: case assumes that this is a long-polling request that wasn't fulfilled at the time when it was recorded. To simulate this a sleep method was used. """ - import asyncio + pass # yield from asyncio.sleep(1000) else: raise diff --git a/tests/manual/tornado/subscribe_stub.py b/tests/manual/tornado/subscribe_stub.py index db84afc7..1be9480a 100644 --- a/tests/manual/tornado/subscribe_stub.py +++ b/tests/manual/tornado/subscribe_stub.py @@ -44,10 +44,10 @@ def main(): [ (r"/v2/subscribe/demo/demo/0", SubscribeHandler), (r"/time/0", TimeHandler), - ], + ], cookie_secret="__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__", xsrf_cookies=True, - ) + ) app.listen(8089) ioloop.start() From e090ab9ddb66bb98503d001bd981520149888500 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 15 Dec 2016 10:13:30 -0800 Subject: [PATCH 427/468] Add manual tests to ignore --- scripts/run-tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index de960d4b..6f9d08bd 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -14,7 +14,7 @@ pyenv_version = os.getenv('PYENV_VERSION', 0) travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) version = str(travis_version or pyenv_version) -tcmn = 'py.test tests --cov-report=xml --cov=./pubnub ' +tcmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/manual/ ' fcmn = 'flake8 --exclude=scripts/,src/,.cache,.git,.idea,.tox,._trial_temp/' From abba312445af11621973ae9cc8314d3c94f09491 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 15 Dec 2016 10:17:51 -0800 Subject: [PATCH 428/468] Comment out python exceptions handling tests --- tests/integrational/tornado/test_invocations.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integrational/tornado/test_invocations.py b/tests/integrational/tornado/test_invocations.py index 92bb2d7e..ec717065 100644 --- a/tests/integrational/tornado/test_invocations.py +++ b/tests/integrational/tornado/test_invocations.py @@ -50,7 +50,7 @@ def test_publish_result_raises_pubnub_error(self): pubnub.stop() @tornado.testing.gen_test - def test_publish_result_raises_lower_level_error(self): + def xtest_publish_result_raises_lower_level_error(self): pubnub = PubNubTornado(pnconf_sub_copy(), custom_ioloop=self.io_loop) # TODO: find a better way ot emulate broken connection @@ -86,7 +86,7 @@ def test_publish_future_raises(self): pubnub.stop() @tornado.testing.gen_test - def test_publish_future_raises_lower_level_error(self): + def xtest_publish_future_raises_lower_level_error(self): pubnub = PubNubTornado(corrupted_keys, custom_ioloop=self.io_loop) pubnub.http.close() From d89135e88ed2631c251e0c01e1bbc92f2cf4e47e Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 15 Dec 2016 08:34:03 -0800 Subject: [PATCH 429/468] Fix + sign encoding --- pubnub/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub/utils.py b/pubnub/utils.py index 127eb617..8372a1cb 100644 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -33,9 +33,9 @@ def get_data_for_user(data): def write_value_as_string(data): try: if isinstance(data, six.string_types): - return ("\"%s\"" % data).replace("+", "%20") + return "\"%s\"" % data else: - return json.dumps(data).replace("+", "%20") + return json.dumps(data) except TypeError: raise PubNubException( pn_error=PNERR_JSON_NOT_SERIALIZABLE @@ -43,7 +43,7 @@ def write_value_as_string(data): def url_encode(data): - return six.moves.urllib.parse.quote(data, safe="") + return six.moves.urllib.parse.quote(data, safe="").replace("+", "%2B") def uuid(): From 26743e10be57e346ac236f30715f99157c83eb77 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 15 Dec 2016 14:21:24 -0800 Subject: [PATCH 430/468] version bump --- pubnub/pubnub_core.py | 2 +- setup.py | 2 +- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channels.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 30 +++++----- .../fixtures/asyncio/here_now/global.yaml | 18 +++--- .../asyncio/here_now/multiple_channels.yaml | 18 +++--- .../asyncio/here_now/single_channel.yaml | 18 +++--- .../fixtures/asyncio/pam/global_level.yaml | 18 +++--- .../asyncio/pam/multiple_channel_groups.yaml | 12 ++-- .../multiple_channel_groups_with_auth.yaml | 12 ++-- .../asyncio/pam/multiple_channels.yaml | 12 ++-- .../pam/multiple_channels_with_auth.yaml | 12 ++-- .../asyncio/pam/sign_non_pam_request.yaml | 6 +- .../fixtures/asyncio/pam/single_channel.yaml | 12 ++-- .../asyncio/pam/single_channel_group.yaml | 12 ++-- .../pam/single_channel_group_with_auth.yaml | 12 ++-- .../asyncio/pam/single_channel_with_auth.yaml | 12 ++-- .../asyncio/publish/do_not_store.yaml | 6 +- .../fixtures/asyncio/publish/invalid_key.yaml | 6 +- .../fixtures/asyncio/publish/meta_object.yaml | 6 +- .../asyncio/publish/mixed_via_get.yaml | 24 ++++---- .../publish/mixed_via_get_encrypted.yaml | 24 ++++---- .../asyncio/publish/mixed_via_post.yaml | 24 ++++---- .../publish/mixed_via_post_encrypted.yaml | 24 ++++---- .../asyncio/publish/not_permitted.yaml | 6 +- .../asyncio/publish/object_via_get.yaml | 6 +- .../publish/object_via_get_encrypted.yaml | 6 +- .../asyncio/publish/object_via_post.yaml | 6 +- .../publish/object_via_post_encrypted.yaml | 6 +- .../fixtures/asyncio/secure/ssl.yaml | 6 +- .../asyncio/state/multiple_channel.yaml | 8 +-- .../asyncio/state/single_channel.yaml | 8 +-- .../single_channel_with_subscription.yaml | 48 +++++++-------- .../asyncio/subscription/cg_join_leave.yaml | 54 ++++++++--------- .../subscription/cg_sub_pub_unsub.yaml | 36 +++++------ .../asyncio/subscription/cg_sub_unsub.yaml | 24 ++++---- .../asyncio/subscription/join_leave.yaml | 42 ++++++------- .../asyncio/subscription/sub_pub_unsub.yaml | 18 +++--- .../subscription/sub_pub_unsub_enc.yaml | 24 ++++---- .../asyncio/subscription/sub_unsub.yaml | 12 ++-- .../asyncio/subscription/unsubscribe_all.yaml | 36 +++++------ .../fixtures/asyncio/time/get.yaml | 6 +- .../asyncio/where_now/multiple_channels.yaml | 18 +++--- .../asyncio/where_now/single_channel.yaml | 18 +++--- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../fixtures/native_sync/history/basic.yaml | 24 ++++---- .../fixtures/native_sync/history/encoded.yaml | 24 ++++---- .../native_sync/history/not_permitted.yaml | 4 +- .../native_sync/publish/invalid_key.yaml | 4 +- .../native_sync/publish/publish_bool_get.yaml | 4 +- .../publish/publish_bool_post.yaml | 4 +- .../publish/publish_do_not_store.yaml | 4 +- .../publish/publish_encrypted_list_get.yaml | 4 +- .../publish/publish_encrypted_list_post.yaml | 4 +- .../publish/publish_encrypted_string_get.yaml | 4 +- .../publish_encrypted_string_post.yaml | 4 +- .../native_sync/publish/publish_int_get.yaml | 4 +- .../native_sync/publish/publish_int_post.yaml | 4 +- .../native_sync/publish/publish_list_get.yaml | 4 +- .../publish/publish_list_post.yaml | 4 +- .../publish/publish_object_get.yaml | 4 +- .../publish/publish_object_post.yaml | 4 +- .../publish/publish_string_get.yaml | 4 +- .../publish/publish_string_post.yaml | 4 +- .../publish/publish_with_meta.yaml | 4 +- .../fixtures/native_sync/ssl/ssl.yaml | 4 +- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../add_channel_remove_group.yaml | 16 ++--- .../add_remove_multiple_channels.yaml | 16 ++--- .../channel_groups/single_channel.yaml | 16 ++--- .../state/state_of_multiple_channels.yaml | 8 +-- .../state/state_of_single_channel.yaml | 8 +-- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channel.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 24 ++++---- .../fixtures/tornado/heartbeat/timeout.yaml | 60 +++++++++---------- .../fixtures/tornado/here_now/global.yaml | 30 +++++----- .../fixtures/tornado/here_now/multiple.yaml | 24 ++++---- .../fixtures/tornado/here_now/single.yaml | 18 +++--- .../tornado/publish/do_not_store.yaml | 12 ++-- .../fixtures/tornado/publish/invalid_key.yaml | 12 ++-- .../fixtures/tornado/publish/meta_object.yaml | 12 ++-- .../tornado/publish/mixed_via_get.yaml | 48 +++++++-------- .../publish/mixed_via_get_encrypted.yaml | 48 +++++++-------- .../tornado/publish/mixed_via_post.yaml | 48 +++++++-------- .../publish/mixed_via_post_encrypted.yaml | 48 +++++++-------- .../tornado/publish/not_permitted.yaml | 12 ++-- .../tornado/publish/object_via_get.yaml | 12 ++-- .../publish/object_via_get_encrypted.yaml | 12 ++-- .../tornado/publish/object_via_post.yaml | 12 ++-- .../publish/object_via_post_encrypted.yaml | 12 ++-- .../tornado/state/multiple_channel.yaml | 12 ++-- .../tornado/state/single_channel.yaml | 12 ++-- .../tornado/subscribe/group_join_leave.yaml | 60 +++++++++---------- .../subscribe/group_sub_pub_unsub.yaml | 36 +++++------ .../tornado/subscribe/group_sub_unsub.yaml | 24 ++++---- .../tornado/subscribe/join_leave.yaml | 48 +++++++-------- .../tornado/subscribe/sub_pub_unsub.yaml | 24 ++++---- .../fixtures/tornado/subscribe/sub_unsub.yaml | 12 ++-- .../subscribe/subscribe_tep_by_step.yaml | 24 ++++---- .../tornado/where_now/multiple_channels.yaml | 30 +++++----- .../tornado/where_now/single_channel.yaml | 18 +++--- .../fixtures/twisted/groups/add_channels.yaml | 8 +-- .../twisted/groups/add_single_channel.yaml | 8 +-- .../twisted/groups/list_channels.yaml | 8 +-- .../twisted/groups/remove_channels.yaml | 8 +-- .../twisted/groups/remove_single_channel.yaml | 8 +-- .../fixtures/twisted/here_now/global.yaml | 8 +-- .../fixtures/twisted/here_now/multiple.yaml | 8 +-- .../fixtures/twisted/here_now/single.yaml | 8 +-- .../twisted/publish/do_not_store.yaml | 8 +-- .../fixtures/twisted/publish/forbidden.yaml | 8 +-- .../fixtures/twisted/publish/invalid_key.yaml | 8 +-- .../fixtures/twisted/publish/meta_object.yaml | 8 +-- .../publish/mixed_encrypted_via_get.yaml | 32 +++++----- .../twisted/publish/mixed_via_get.yaml | 32 +++++----- .../twisted/publish/object_via_get.yaml | 8 +-- .../twisted/state/multiple_channels.yaml | 8 +-- .../twisted/state/single_channel.yaml | 8 +-- .../fixtures/twisted/where_now/multiple.yaml | 8 +-- .../fixtures/twisted/where_now/single.yaml | 8 +-- tests/unit/test_utils.py | 2 +- tests/unit/test_vcr_helper.py | 4 +- 127 files changed, 1004 insertions(+), 1004 deletions(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 1a0f64eb..b7ad1843 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.2" + SDK_VERSION = "4.0.3" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index 749fb506..929adfaf 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.2', + version='4.0.3', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index 39e1d469..439c7f2b 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:04 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 6b0eb0c1..a3346f48 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index 6abd8d1a..b72f6bb3 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14713558782056075"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -26,13 +26,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", @@ -42,13 +42,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-channel-groups-asyncio-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -57,13 +57,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&remove=test-channel-groups-asyncio-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=test-channel-groups-asyncio-ch - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} @@ -72,5 +72,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 4b96973e..77874e86 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14714204724402473","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:32 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -29,13 +29,13 @@ interactions: CONTENT-LENGTH: '412', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -44,5 +44,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:38 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 041e2f9e..7fc691f7 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713594568087822","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -28,13 +28,13 @@ interactions: CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -43,5 +43,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index e05bbd11..70b84aea 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14713563292410522","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:29 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index e81a2e64..0e4a2c8c 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access Manager","status":200}'} @@ -30,13 +30,13 @@ interactions: CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=0&uuid=my_uuid&w=0 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&uuid=my_uuid&w=0 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access Manager","status":200}'} @@ -46,5 +46,5 @@ interactions: CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 30 Sep 2016 07:28:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index d7c9b49e..9fee783a 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index e2b05ca8..5295c836 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 11:41:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index c9624b20..c8f78cd1 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:36:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index fd576eb2..8a46dd8b 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '345', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 09:35:22 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml index 2d1f37a5..fafea2f5 100644 --- a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml +++ b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=my_uuid + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=my_uuid response: body: {string: '{"message":"Forbidden","payload":{"channels":["blah"]},"error":true,"service":"Access Manager","status":403} @@ -16,5 +16,5 @@ interactions: CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 14 Oct 2016 12:51:06 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index d4e2aac5..8a04280b 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:52 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index dad5fe54..ac55b86f 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index 044a93d5..a233f18c 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index 54ac6993..3f1f99da 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, 17 Aug 2016 08:47:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index 83b1fc97..875e5ab7 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&store=0 response: body: {string: '[1,"Sent","14715124518965795"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:27:31 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index ecbe6295..7cc53655 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[0,"Invalid Key","14715121286597316"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:22:08 GMT'} status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad + url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index a58eadac..0f0592ad 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715122016841196"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:23:21 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.2&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.3&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index c2432b54..6560e644 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531073577558"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531073592350"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531073603443"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531073604938"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index 8be60d27..d872e144 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715101539265931"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715101539286406"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715101539293096"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=2 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715101539315353"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index 128b5b8f..a2439d7c 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -2,53 +2,53 @@ interactions: - request: body: 'true' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531007838319"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"hi"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531007890145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '5' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531007894502"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '["hi", "hi2", "hi3"]' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531007926933"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index 958c5fb1..f23e3167 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -2,53 +2,53 @@ interactions: - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715113500557815"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715113500599883"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715113500607388"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715113500616628"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index 52595739..8f5a8294 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2×tamp=1476628727 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3×tamp=1476628727 response: body: {string: '[1,"Sent","14766287276539619"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 14:38:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index d525e411..b96c3ac2 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714531074414363"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index fe156aa0..5efc4dd7 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715102088417575"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:50:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index 8bbc7c45..1d1fc567 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '{"online": true, "name": "Alex"}' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14714530475966145"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:57:27 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index f5d8c25f..b8e4387b 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -2,14 +2,14 @@ interactions: - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14715113905714923"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index 1e64a0aa..afec906b 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14714344166454996"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:46:56 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index e2798dcf..463b4a55 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index f2f37645..29e02c98 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.2&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 429793b8..3f0c7bf2 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14724899162046665","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -25,13 +25,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -39,13 +39,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:47 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -53,13 +53,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:52 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:57 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -82,13 +82,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": @@ -98,13 +98,13 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -113,5 +113,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:59:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index 769d2dfe..ff7c68fa 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:07 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14713511480343359","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511480343359 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511480343359 response: body: {string: '{"t":{"t":"14713511489324977","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511488470095","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351148, "uuid": "test-subscribe-asyncio-listener", @@ -41,26 +41,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511480343359 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511480343359 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14713511488599816","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:08 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511489324977 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511489324977 response: body: {string: '{"t":{"t":"14713511498339636","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511497874401","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511489324977 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511489324977 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511498339636 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511498339636 response: body: {string: '{"t":{"t":"14713511502190714","r":12},"m":[{"a":"2","f":0,"p":{"t":"14713511499971846","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "leave", "timestamp": 1471351149, "uuid": "test-subscribe-asyncio-messenger", @@ -99,13 +99,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511498339636 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511498339636 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -114,13 +114,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -129,5 +129,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:10 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 2d39a967..78a2965b 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,52 +13,52 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14713511466073676","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14713511467409673"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511466073676 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511466073676 response: body: {string: '{"t":{"t":"14713511467422512","r":12},"m":[{"a":"2","f":0,"i":"f73c5107-519c-42fd-b1e1-7f9377430082","s":1,"p":{"t":"14713511467409673","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=14713511466073676 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511466073676 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -82,5 +82,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:06 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 66972ef3..23a610aa 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14713511453005433","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,13 +41,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -56,5 +56,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:05 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index ff87f671..0d4d5382 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713498789397698","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511412634058","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511411661104","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-listener", @@ -26,26 +26,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511412354502","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -54,13 +54,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511418815177","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511418422322","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "leave", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -99,5 +99,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:02 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index dcc926bb..c4bdbab7 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -2,40 +2,40 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-uuid-sub + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"t":{"t":"14786823981211583","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-uuid-sub + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-uuid-sub - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=test-subscribe-asyncio-uuid-pub + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=test-subscribe-asyncio-uuid-pub response: body: {string: '[1,"Sent","14786827442126245"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2&seqn=1&uuid=test-subscribe-asyncio-uuid-pub + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=test-subscribe-asyncio-uuid-pub - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"t":{"t":"14786827442166827","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14786827442126245","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 09 Nov 2016 09:12:24 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index 110cc1d9..8fdc2d09 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -2,48 +2,48 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511400418859","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[1,"Sent","14713511404390559"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511404397571","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14713511404390559","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index 21ab15e0..0b614d7d 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14713511396585426","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -26,5 +26,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:38:59 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index a1fe37f5..06b2b13d 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -28,26 +28,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:14 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14742262356649203","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:15 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -56,13 +56,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -71,13 +71,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -86,5 +86,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Sep 2016 19:17:16 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index 3e469742..c379c5d5 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '[14766398773102530]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 16 Oct 2016 17:44:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=1517d268-4797-4fcb-941c-0f862e61399f + url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=1517d268-4797-4fcb-941c-0f862e61399f version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index 5c317bef..1d4e01ee 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"t":{"t":"14714362383675346","r":3},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:18 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:25 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index 3de35653..689853b2 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -2,22 +2,22 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14714351489282409","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:09 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.2&tt=0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index 61428abd..53ca296e 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index 51b83847..433bd77e 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index bc15ed60..8c7b38ba 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-native-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 52207962..64504be4 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14694610268707663"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.2&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.3&seqn=2 response: body: {string: '[1,"Sent","14694610269494321"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.2&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.3&seqn=3 response: body: {string: '[1,"Sent","14694610270571781"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.2&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.3&seqn=4 response: body: {string: '[1,"Sent","14694610271664959"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.2&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.3&seqn=5 response: body: {string: '[1,"Sent","14694610272640835"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14694610268707663,14694610272640835]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index c3a5045b..3cb09104 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14695248164027962"]'} headers: @@ -25,9 +25,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=2 response: body: {string: '[1,"Sent","14695248165146799"]'} headers: @@ -45,9 +45,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=3 response: body: {string: '[1,"Sent","14695248166152452"]'} headers: @@ -65,9 +65,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=4 response: body: {string: '[1,"Sent","14695248167059434"]'} headers: @@ -85,9 +85,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=5 response: body: {string: '[1,"Sent","14695248167891717"]'} headers: @@ -105,9 +105,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14695248164027962,14695248167891717]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index 3bf9e5f5..dbb492c7 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"message":"Forbidden","payload":{"channels":["history-native-sync-ch"]},"error":true,"service":"Access Manager","status":403} diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index ba6dbf55..70e3e890 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[0,"Invalid Key","14691119692918567"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index bdd8ed2b..1e981019 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119695085971"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index fef441e2..9bad08dc 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119697248854"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index 1d4d8b50..25515039 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1&store=0 response: body: {string: '[1,"Sent","14691119699221362"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index 67d52c14..7a402a29 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119701316179"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index 2f3b2b60..ae7345cf 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119703765115"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index d68c9a39..8892b37e 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119705911160"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index c49bbf5b..47bb6c66 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119708241133"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index d27f1518..bd674a5c 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119710341756"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index 6bda3152..47754801 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['1'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119712785973"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index 913ea757..6cc52f30 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119714790991"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index 92127d82..1a51e628 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['20'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119717175739"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index 4c17f57a..8b51b237 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691173575177499"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 6fa71e31..387141ab 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['32'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119720483041"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index d57a6b64..ae26531e 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14703077680843249"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index b5b5da67..086e030e 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -7,9 +7,9 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691119724317947"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index 3b429bf0..dd47a7d1 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14691124461710414"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index f9c2381c..329a98f5 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.2&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14698699475874207"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index 7b97da55..c12f3d8d 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index 6af8edaa..a43a985b 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index be6113dc..4f3bf0c4 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index efecc3c6..7cb2bdbb 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index 64d6805e..93c028a6 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -54,9 +54,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2&remove=channel-groups-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -78,9 +78,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index 2e619485..07d9bbf3 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index db88f9e5..615d261a 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -29,9 +29,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.2] + User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml index 80074015..268360d9 100644 --- a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml index 61808e71..35da7dae 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['187'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml index 658fc494..79b2f2ef 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2&add=channel-groups-tornado-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=channel-groups-tornado-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml index 85beb311..433b6dea 100644 --- a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341188112072 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341188112072 response: body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341195231188 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341195231188 response: body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -176,14 +176,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -218,14 +218,14 @@ interactions: - Age - ['3'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -260,14 +260,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341206425665 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341206425665 response: body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -295,14 +295,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14720341368999461 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341368999461 response: body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -330,14 +330,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -373,5 +373,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=heartbeat-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml index e7e76058..e073a67b 100644 --- a/tests/integrational/fixtures/tornado/here_now/global.yaml +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -185,5 +185,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml index 180325b4..27293933 100644 --- a/tests/integrational/fixtures/tornado/here_now/multiple.yaml +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&uuid=test-here-now-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-here-now-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml index e2b4d16d..5351f4bd 100644 --- a/tests/integrational/fixtures/tornado/here_now/single.yaml +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:34 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-uuid"], "occupancy": 1}'} @@ -74,14 +74,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:38 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:39 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml index a938b7af..2aae9d45 100644 --- a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 response: body: {string: '[1,"Sent","14707213568554057"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 response: body: {string: '[1,"Sent","14707213569308777"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml index 84532836..abbdc038 100644 --- a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[0,"Invalid Key","14707240653092162"]'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[0,"Invalid Key","14707240653816927"]'} headers: @@ -64,5 +64,5 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml index ab79b915..485ad7da 100644 --- a/tests/integrational/fixtures/tornado/publish/meta_object.yaml +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14707233493629583"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14707233494525529"]'} headers: @@ -64,5 +64,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml index f46314bd..7f8dbe53 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654961878754"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654962988338"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654963998910"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654965094211"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654966264107"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654968497326"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654969624146"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654971058947"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml index b6f8be17..b7d9a024 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654973576283"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654974534808"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654975469383"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654976370725"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654977343057"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654978302189"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654979370691"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654980293520"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml index 6f84db1f..cb506ceb 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789261217101"]'} headers: @@ -31,14 +31,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789261901583"]'} headers: @@ -64,14 +64,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789262581697"]'} headers: @@ -97,14 +97,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789263258448"]'} headers: @@ -130,14 +130,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789263937508"]'} headers: @@ -163,14 +163,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789264623948"]'} headers: @@ -196,14 +196,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789265622885"]'} headers: @@ -229,14 +229,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789266306131"]'} headers: @@ -262,5 +262,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml index 0d03d956..dd2bf388 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724320847330"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724321905127"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724322939251"]'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724323960752"]'} headers: @@ -130,14 +130,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724325062358"]'} headers: @@ -163,14 +163,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724326150829"]'} headers: @@ -196,14 +196,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724327259504"]'} headers: @@ -229,14 +229,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724328343318"]'} headers: @@ -262,5 +262,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index b4089255..274dddec 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -46,14 +46,14 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -94,5 +94,5 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml index 291a8eae..fc0c4fde 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653397219269"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653398506519"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml index 901430d0..b10d5800 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653400646308"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653401928744"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml index 0a1c4e73..35c912bf 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706787329216107"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff - request: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706787330184998"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml index ef876aa2..820d842c 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706781595277610"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1 - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706781596540558"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=2 version: 1 diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml index 32703c1f..40df8f47 100644 --- a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, @@ -85,5 +85,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml index 7a8de326..95f7c2fa 100644 --- a/tests/integrational/fixtures/tornado/state/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.2&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} @@ -84,5 +84,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=state-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index ea4e4473..bfa3fbf7 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708460251954075","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460251954075 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460251954075 response: body: {string: '{"t":{"t":"14708460259366919","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460258668827","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846025, "uuid": "test-subscribe-listener", "occupancy": @@ -109,14 +109,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708460259353278","r":3},"m":[]}'} headers: @@ -142,14 +142,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460259366919 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460259366919 response: body: {string: '{"t":{"t":"14708460267928187","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460266713809","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -177,14 +177,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -220,14 +220,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460267928187 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460267928187 response: body: {string: '{"t":{"t":"14708460271883006","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460269981178","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": @@ -255,14 +255,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -298,14 +298,14 @@ interactions: - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708460271883006 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460271883006 response: body: {string: '{"t":{"t":"14708460276100655","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460273860352","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1470846027, "uuid": "test-subscribe-listener", "occupancy": @@ -333,14 +333,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-test-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-test-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -376,5 +376,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index ab7614d5..cc7d74c1 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708450055747125","r":3},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14708450057626682"]'} headers: @@ -107,14 +107,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708450055747125 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708450055747125 response: body: {string: '{"t":{"t":"14708450057612306","r":3},"m":[{"a":"2","f":0,"i":"881d453a-4ef5-4dc3-a5a5-be11147ae030","s":1,"p":{"t":"14708450057626682","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} headers: @@ -140,14 +140,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,14 +183,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -226,5 +226,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index a5fadbe8..d0c86478 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708447464037454","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,14 +117,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.2&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-unsubscribe-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -160,5 +160,5 @@ interactions: - Cache-Control - [no-cache] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index 4258e4f0..c33b618f 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708438179383195","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:48 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=subscribe-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708438179383195 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708438179383195 response: body: {string: '{"t":{"t":"14708443090824007","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443089669538","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844308, "uuid": "subscribe-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708443090868294","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443090824007 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708443090824007 response: body: {string: '{"t":{"t":"14708443098649253","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443097146633","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1470844309, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:49 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443098649253 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708443098649253 response: body: {string: '{"t":{"t":"14708443101375638","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443100579978","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-messenger", "occupancy": @@ -169,14 +169,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -212,14 +212,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=14708443101375638 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708443101375638 response: body: {string: '{"t":{"t":"14708443105516188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14708443104721390","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1470844310, "uuid": "subscribe-tornado-listener", "occupancy": @@ -247,14 +247,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -290,5 +290,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 15:51:50 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index 327cd265..453b095b 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708323099136684","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14708323101133727"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=14708323099136684 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708323099136684 response: body: {string: '{"t":{"t":"14708323101140128","r":3},"m":[{"a":"2","f":0,"i":"970e123c-d9a0-45b8-b885-3dae1011bf03","s":1,"p":{"t":"14708323101133727","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=14708323099136684&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708323099136684&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -140,5 +140,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index 6ba9b1c8..da3d6387 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708323101261227","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index c53545e8..57463ac1 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717806990508559","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:19 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717807001063591","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Date - ['Sun, 21 Aug 2016 11:58:20 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml index d881a954..72c863ea 100644 --- a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tr=12&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", "where-now-tornado-ch1"]}, "service": "Presence"}'} @@ -140,14 +140,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,5 +183,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.2 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml index 99b61b1f..f6f9364d 100644 --- a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=where-now-tornado-uuid&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, "service": "Presence"}'} @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.2] + User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.2&uuid=where-now-tornado-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml index adfcacc8..43f76d01 100644 --- a/tests/integrational/fixtures/twisted/groups/add_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml index 782e5e0a..30721b7b 100644 --- a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml index cddf7f4c..b929d8c4 100644 --- a/tests/integrational/fixtures/twisted/groups/list_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml index f8f7aada..75657fad 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&remove=cgttc0%2Ccgttc1 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc0%2Ccgttc1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml index 552b6f5e..d62cae69 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&remove=cgttc + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml index 8a7dcb4d..e57ebafc 100644 --- a/tests/integrational/fixtures/twisted/here_now/global.yaml +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -12,7 +12,7 @@ interactions: 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml index 9540b5b6..f95ecdcc 100644 --- a/tests/integrational/fixtures/twisted/here_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -2,16 +2,16 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}}, "total_channels": 1, "total_occupancy": 1}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml index 7aa8c34a..ac7d0927 100644 --- a/tests/integrational/fixtures/twisted/here_now/single.yaml +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml index 6c9888f1..3d6e4671 100644 --- a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&store=0 response: body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index 2480c0c2..5927e104 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -12,7 +12,7 @@ interactions: '} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 403, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.2&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml index 3f92969c..951dbec7 100644 --- a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 400, message: ''} - url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 + url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml index 1d1a3317..53b4ca40 100644 --- a/tests/integrational/fixtures/twisted/publish/meta_object.yaml +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml index 75a04ee0..2d976fff 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml index c8c75764..2db8d8bb 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml index 8483152e..9a18ad67 100644 --- a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml index de21f1cd..190c9bb5 100644 --- a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.2&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml index 6b659ffe..2879fe4c 100644 --- a/tests/integrational/fixtures/twisted/state/single_channel.yaml +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.2&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=someuuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml index eee03a04..22b0cdc6 100644 --- a/tests/integrational/fixtures/twisted/where_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml index bf13ad0e..62c9300a 100644 --- a/tests/integrational/fixtures/twisted/where_now/single.yaml +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.2] + user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.2&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f version: 1 diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 7d4620bc..0df6c4c8 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -72,7 +72,7 @@ def test_sign_sha_256(self): input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 grant -channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.2&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.3&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) assert "ty5TgZtcl-wWkdNCbW--IHg_DPG7ryhfqxJnZhjmhD8=" == result diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index 9bad8b38..7994d74d 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -26,10 +26,10 @@ def test_string_list_in_path_matcher(self): def test_string_list_in_path_query_matcher(self): r1 = Request( - query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.2'), + query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.3'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) r2 = Request( - query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.2'), + query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.3'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) assert string_list_in_query_matcher(r1, r2, ['channel']) From 5c86ac958897928980360976dd0f507d87fa2bae Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 15 Dec 2016 14:32:59 -0800 Subject: [PATCH 431/468] fix up encryption test --- .pubnub.yml | 7 ++++++- CHANGELOG.md | 24 ++++++++++++++++++++++++ tests/unit/test_utils.py | 2 +- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index dfaaddec..3409f129 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.2 +version: 4.0.3 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.3 + date: + changes: + - type: improvement + text: do not strip plus sign when encoding message. - version: v4.0.2 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index f51428f7..9d5e1f9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,28 @@ +## [v4.0.3](https://github.com/pubnub/python/tree/v4.0.3) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.2...v4.0.3) + + +- ⭐do not strip plus sign when encoding message. + + + +## [v4.0.2](https://github.com/pubnub/python/tree/v4.0.2) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.1...v4.0.2) + + +- ⭐Adjusting maximum pool size for requests installations + + + +- ⭐Adding Publsher UUID + + + ## [v4.0.1](https://github.com/pubnub/python/tree/v4.0.1) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 0df6c4c8..a9280f2d 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -75,4 +75,4 @@ def test_sign_sha_256(self): channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.3&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) - assert "ty5TgZtcl-wWkdNCbW--IHg_DPG7ryhfqxJnZhjmhD8=" == result + assert "mLDxOYJvrvRIDryzqNhoRsE4-Pz26KVzqCAI7hkXdEQ=" == result From 08834ac6e2f67f80b1a3a30810c3ece6e83402e2 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 18 Dec 2016 13:53:12 -0800 Subject: [PATCH 432/468] Remove pnsdk VCR tracking; Fix incorrect query encoding --- pubnub/endpoints/endpoint.py | 14 +- pubnub/endpoints/presence/heartbeat.py | 2 +- pubnub/pubnub_asyncio.py | 9 +- pubnub/utils.py | 5 + tests/functional/test_heartbeat.py | 9 +- tests/functional/test_publish.py | 2 +- .../asyncio/test_channel_groups.py | 6 +- tests/integrational/asyncio/test_here_now.py | 2 + .../integrational/asyncio/test_invocations.py | 12 +- tests/integrational/asyncio/test_pam.py | 18 +- tests/integrational/asyncio/test_publish.py | 24 +- tests/integrational/asyncio/test_ssl.py | 2 +- tests/integrational/asyncio/test_state.py | 13 +- tests/integrational/asyncio/test_subscribe.py | 19 +- tests/integrational/asyncio/test_time.py | 2 +- tests/integrational/asyncio/test_where_now.py | 3 +- .../groups/add_channel_remove_group.yaml | 24 +- .../groups/add_remove_multiple_channels.yaml | 24 +- .../groups/add_remove_single_channel.yaml | 32 +- .../fixtures/asyncio/here_now/global.yaml | 34 +- .../asyncio/here_now/multiple_channels.yaml | 20 +- .../asyncio/here_now/single_channel.yaml | 20 +- .../asyncio/invocations/envelope.yaml | 10 +- .../asyncio/invocations/envelope_raises.yaml | 20 ++ .../fixtures/asyncio/invocations/future.yaml | 10 +- .../future_raises_pubnub_error.yaml | 8 +- .../fixtures/asyncio/pam/global_level.yaml | 22 +- .../asyncio/pam/multiple_channel_groups.yaml | 18 +- .../multiple_channel_groups_with_auth.yaml | 16 +- .../asyncio/pam/multiple_channels.yaml | 18 +- .../pam/multiple_channels_with_auth.yaml | 18 +- .../asyncio/pam/sign_non_pam_request.yaml | 20 -- .../fixtures/asyncio/pam/single_channel.yaml | 18 +- .../asyncio/pam/single_channel_group.yaml | 18 +- .../pam/single_channel_group_with_auth.yaml | 16 +- .../asyncio/pam/single_channel_with_auth.yaml | 16 +- .../asyncio/publish/do_not_store.yaml | 8 +- .../fixtures/asyncio/publish/invalid_key.yaml | 8 +- .../fixtures/asyncio/publish/meta_object.yaml | 8 +- .../asyncio/publish/mixed_via_get.yaml | 32 +- .../publish/mixed_via_get_encrypted.yaml | 32 +- .../asyncio/publish/mixed_via_post.yaml | 36 +- .../publish/mixed_via_post_encrypted.yaml | 36 +- .../asyncio/publish/not_permitted.yaml | 19 +- .../asyncio/publish/object_via_get.yaml | 8 +- .../publish/object_via_get_encrypted.yaml | 8 +- .../asyncio/publish/object_via_post.yaml | 8 +- .../publish/object_via_post_encrypted.yaml | 8 +- .../fixtures/asyncio/secure/ssl.yaml | 8 +- .../asyncio/state/multiple_channel.yaml | 10 +- .../asyncio/state/single_channel.yaml | 14 +- .../single_channel_with_subscription.yaml | 64 ++-- .../asyncio/subscription/cg_join_leave.yaml | 74 ++-- .../subscription/cg_sub_pub_unsub.yaml | 44 +-- .../asyncio/subscription/cg_sub_unsub.yaml | 28 +- .../asyncio/subscription/join_leave.yaml | 70 ++-- .../asyncio/subscription/sub_pub_unsub.yaml | 43 ++- .../subscription/sub_pub_unsub_enc.yaml | 36 +- .../asyncio/subscription/sub_unsub.yaml | 18 +- .../asyncio/subscription/unsubscribe_all.yaml | 32 +- .../fixtures/asyncio/time/get.yaml | 8 +- .../asyncio/where_now/multiple_channels.yaml | 26 +- .../asyncio/where_now/single_channel.yaml | 20 +- .../add_channel_remove_group.yaml | 40 ++- .../add_remove_multiple_channels.yaml | 40 ++- .../channel_groups/single_channel.yaml | 40 ++- .../fixtures/native_sync/history/basic.yaml | 36 +- .../fixtures/native_sync/history/encoded.yaml | 36 +- .../native_sync/history/not_permitted.yaml | 21 +- .../native_sync/publish/invalid_key.yaml | 6 +- .../native_sync/publish/publish_bool_get.yaml | 4 +- .../publish/publish_bool_post.yaml | 9 +- .../publish/publish_do_not_store.yaml | 6 +- .../publish/publish_encrypted_list_get.yaml | 6 +- .../publish/publish_encrypted_list_post.yaml | 9 +- .../publish/publish_encrypted_string_get.yaml | 6 +- .../publish_encrypted_string_post.yaml | 9 +- .../native_sync/publish/publish_int_get.yaml | 6 +- .../native_sync/publish/publish_int_post.yaml | 9 +- .../native_sync/publish/publish_list_get.yaml | 6 +- .../publish/publish_list_post.yaml | 9 +- .../publish/publish_object_get.yaml | 6 +- .../publish/publish_object_post.yaml | 9 +- .../publish/publish_string_get.yaml | 6 +- .../publish/publish_string_post.yaml | 9 +- .../publish/publish_with_meta.yaml | 6 +- .../fixtures/native_sync/ssl/ssl.yaml | 6 +- .../state/state_of_multiple_channels.yaml | 8 +- .../state/state_of_single_channel.yaml | 8 +- .../add_channel_remove_group.yaml | 16 +- .../add_remove_multiple_channels.yaml | 16 +- .../channel_groups/single_channel.yaml | 16 +- .../state/state_of_multiple_channels.yaml | 8 +- .../state/state_of_single_channel.yaml | 8 +- .../tornado/subscribe/group_join_leave.yaml | 324 +++++++++--------- .../subscribe/group_sub_pub_unsub.yaml | 188 +++++----- .../tornado/subscribe/group_sub_unsub.yaml | 148 ++++---- .../tornado/subscribe/join_leave.yaml | 72 ++-- .../tornado/subscribe/sub_pub_unsub.yaml | 122 +++---- .../fixtures/tornado/subscribe/sub_unsub.yaml | 58 ++-- .../subscribe/subscribe_tep_by_step.yaml | 140 ++++---- .../native_sync/test_channel_groups.py | 27 +- .../integrational/native_sync/test_history.py | 6 +- .../integrational/native_sync/test_publish.py | 34 +- tests/integrational/native_sync/test_ssl.py | 2 +- tests/integrational/native_sync/test_state.py | 4 +- .../native_threads/test_channel_groups.py | 6 +- .../native_threads/test_state.py | 4 +- tests/integrational/tornado/test_state.py | 7 +- .../tornado/vcr_tornado_decorator.py | 3 + 110 files changed, 1471 insertions(+), 1324 deletions(-) create mode 100644 tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml delete mode 100644 tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml diff --git a/pubnub/endpoints/endpoint.py b/pubnub/endpoints/endpoint.py index 72d9a4cb..748e7608 100644 --- a/pubnub/endpoints/endpoint.py +++ b/pubnub/endpoints/endpoint.py @@ -141,6 +141,7 @@ def handler(): def build_params_callback(self): def callback(params_to_merge): + operation_type = self.operation_type() custom_params = self.custom_params() custom_params.update(params_to_merge) @@ -154,7 +155,6 @@ def callback(params_to_merge): custom_params['timestamp'] = str(self.pubnub.timestamp()) signed_input = (self.pubnub.config.subscribe_key + "\n" + self.pubnub.config.publish_key + "\n") - operation_type = self.operation_type() if operation_type == PNOperationType.PNAccessManagerAudit: signed_input += 'audit\n' elif operation_type == PNOperationType.PNAccessManagerGrant or \ @@ -166,14 +166,14 @@ def callback(params_to_merge): signed_input += utils.prepare_pam_arguments(custom_params) signature = utils.sign_sha256(self.pubnub.config.secret_key, signed_input) - # REVIEW: add encoder map to not hardcode encoding here - if operation_type == PNOperationType.PNPublishOperation and 'meta' in custom_params: - custom_params['meta'] = utils.url_encode(custom_params['meta']) - if operation_type == PNOperationType.PNSetStateOperation and 'state' in custom_params: - custom_params['state'] = utils.url_encode(custom_params['state']) - custom_params['signature'] = signature + # REVIEW: add encoder map to not hardcode encoding here + if operation_type == PNOperationType.PNPublishOperation and 'meta' in custom_params: + custom_params['meta'] = utils.url_encode(custom_params['meta']) + if operation_type == PNOperationType.PNSetStateOperation and 'state' in custom_params: + custom_params['state'] = utils.url_encode(custom_params['state']) + # reassign since pnsdk should be signed unencoded custom_params['pnsdk'] = utils.url_encode(self.pubnub.sdk_name) diff --git a/pubnub/endpoints/presence/heartbeat.py b/pubnub/endpoints/presence/heartbeat.py index 3cd2eee6..20ea60e8 100644 --- a/pubnub/endpoints/presence/heartbeat.py +++ b/pubnub/endpoints/presence/heartbeat.py @@ -50,7 +50,7 @@ def custom_params(self): params['channel-group'] = utils.join_items(self._groups) if self._state is not None and len(self._state) > 0: - params['state'] = utils.write_value_as_string(self._state) + params['state'] = utils.url_write(self._state) return params diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index 0e36c533..d99a5963 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -112,6 +112,13 @@ def request_future(self, options_func, cancellation_event): @asyncio.coroutine def _request_helper(self, options_func, cancellation_event): + """ + Query string should be provided as a manually serialized and encoded string. + + :param options_func: + :param cancellation_event: + :return: + """ if cancellation_event is not None: assert isinstance(cancellation_event, Event) @@ -445,7 +452,7 @@ def _perform_heartbeat_loop(self): .channel_groups(presence_groups) .state(state_payload) .cancellation_event(cancellation_event) - .result()) + .future()) envelope = yield from heartbeat_call diff --git a/pubnub/utils.py b/pubnub/utils.py index 073c02cf..d098e37d 100644 --- a/pubnub/utils.py +++ b/pubnub/utils.py @@ -47,6 +47,11 @@ def url_encode(data): return six.moves.urllib.parse.quote(data, safe="").replace("+", "%2B") +def url_write(data): + """ Just wraps url_encode(write_value_as_string()) """ + return url_encode(write_value_as_string(data)) + + def uuid(): return str(u.uuid4()) diff --git a/tests/functional/test_heartbeat.py b/tests/functional/test_heartbeat.py index 25554852..257e3555 100644 --- a/tests/functional/test_heartbeat.py +++ b/tests/functional/test_heartbeat.py @@ -83,17 +83,22 @@ def test_hb_multiple_groups_using_list(self): self.assertEqual(self.hb._groups, ['gr1', 'gr2', 'gr3']) def test_hb_with_state(self): + import six + state = {"name": "Alex", "count": 7} self.hb.channels('ch1,ch2').state(state) self.assertEquals(self.hb.build_path(), Heartbeat.HEARTBEAT_PATH % (pnconf.subscribe_key, "ch1,ch2")) - self.assertEqual(self.hb.build_params_callback()({}), { + params = self.hb.build_params_callback()({}) + params['state'] = json.loads(six.moves.urllib.parse.unquote(params['state'])) + + self.assertEqual(params, { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, 'heartbeat': '20', - 'state': json.dumps(state) + 'state': state }) self.assertEqual(self.hb._groups, []) diff --git a/tests/functional/test_publish.py b/tests/functional/test_publish.py index b95860d9..e6c4845f 100644 --- a/tests/functional/test_publish.py +++ b/tests/functional/test_publish.py @@ -72,7 +72,7 @@ def test_pub_with_meta(self): self.assertEqual(self.pub.build_params_callback()({}), { 'pnsdk': sdk_name, 'uuid': self.pubnub.uuid, - 'meta': '["m1", "m2"]', + 'meta': '%5B%22m1%22%2C%20%22m2%22%5D', }) def test_pub_store(self): diff --git a/tests/integrational/asyncio/test_channel_groups.py b/tests/integrational/asyncio/test_channel_groups.py index 036d5356..b36f1e54 100644 --- a/tests/integrational/asyncio/test_channel_groups.py +++ b/tests/integrational/asyncio/test_channel_groups.py @@ -11,7 +11,7 @@ @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_add_remove_single_channel(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -56,7 +56,7 @@ def test_add_remove_single_channel(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_add_remove_multiple_channels(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) @@ -98,7 +98,7 @@ def test_add_remove_multiple_channels(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_add_channel_remove_group(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index c59f27ce..01702655 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -47,6 +47,7 @@ def test_single_channel(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml', + filter_query_parameters=['pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], match_on_kwargs={ 'string_list_in_path': { @@ -91,6 +92,7 @@ def test_multiple_channels(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/here_now/global.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/here_now/global.yaml', + filter_query_parameters=['pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], match_on_kwargs={ 'string_list_in_path': { diff --git a/tests/integrational/asyncio/test_invocations.py b/tests/integrational/asyncio/test_invocations.py index 7f4df522..11afb420 100644 --- a/tests/integrational/asyncio/test_invocations.py +++ b/tests/integrational/asyncio/test_invocations.py @@ -18,7 +18,7 @@ @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/future.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_future(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -29,7 +29,7 @@ def test_publish_future(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_future_raises_pubnub_error(event_loop): pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) @@ -44,7 +44,7 @@ def test_publish_future_raises_pubnub_error(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/future_raises_ll_error.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_future_raises_lower_level_error(event_loop): pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) @@ -60,7 +60,7 @@ def test_publish_future_raises_lower_level_error(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_envelope(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -72,7 +72,7 @@ def test_publish_envelope(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_envelope_raises(event_loop): pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) @@ -85,7 +85,7 @@ def test_publish_envelope_raises(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/invocations/envelope_raises_ll_error.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_envelope_raises_lower_level_error(event_loop): pubnub = PubNubAsyncio(corrupted_keys, custom_event_loop=event_loop) diff --git a/tests/integrational/asyncio/test_pam.py b/tests/integrational/asyncio/test_pam.py index 35158b73..2599a732 100644 --- a/tests/integrational/asyncio/test_pam.py +++ b/tests/integrational/asyncio/test_pam.py @@ -7,7 +7,7 @@ @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/global_level.yaml', - filter_query_parameters=['signature', 'timestamp']) + filter_query_parameters=['signature', 'timestamp', 'pnsdk']) @pytest.mark.asyncio def test_global_level(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -48,7 +48,7 @@ def test_global_level(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel.yaml', - filter_query_parameters=['signature', 'timestamp']) + filter_query_parameters=['signature', 'timestamp', 'pnsdk']) @pytest.mark.asyncio def test_single_channel(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -79,7 +79,7 @@ def test_single_channel(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml', - filter_query_parameters=['signature', 'timestamp']) + filter_query_parameters=['signature', 'timestamp', 'pnsdk']) @pytest.mark.asyncio def test_single_channel_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -113,7 +113,7 @@ def test_single_channel_with_auth(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml', - filter_query_parameters=['signature', 'timestamp'], + filter_query_parameters=['signature', 'timestamp', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], match_on_kwargs={ 'list_keys': ['channel'], @@ -156,7 +156,7 @@ def test_multiple_channels(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml', - filter_query_parameters=['signature', 'timestamp'], + filter_query_parameters=['signature', 'timestamp', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], match_on_kwargs={ 'list_keys': ['channel'], @@ -201,7 +201,7 @@ def test_multiple_channels_with_auth(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml', - filter_query_parameters=['signature', 'timestamp']) + filter_query_parameters=['signature', 'timestamp', 'pnsdk']) @pytest.mark.asyncio def test_single_channel_group(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -234,7 +234,7 @@ def test_single_channel_group(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml', - filter_query_parameters=['signature', 'timestamp']) + filter_query_parameters=['signature', 'timestamp', 'pnsdk']) @pytest.mark.asyncio def test_single_channel_group_with_auth(event_loop): pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop) @@ -269,7 +269,7 @@ def test_single_channel_group_with_auth(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml', - filter_query_parameters=['signature', 'timestamp'], + filter_query_parameters=['signature', 'timestamp', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], match_on_kwargs={ 'list_keys': ['channel-group'], @@ -312,7 +312,7 @@ def test_multiple_channel_groups(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml', - filter_query_parameters=['signature', 'timestamp'], + filter_query_parameters=['signature', 'timestamp', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'string_list_in_query'], match_on_kwargs={ 'list_keys': ['channel-group'], diff --git a/tests/integrational/asyncio/test_publish.py b/tests/integrational/asyncio/test_publish.py index fce23907..1047acf0 100644 --- a/tests/integrational/asyncio/test_publish.py +++ b/tests/integrational/asyncio/test_publish.py @@ -47,7 +47,7 @@ def assert_success_publish_post(pubnub, msg): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_mixed_via_get(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -61,7 +61,7 @@ def test_publish_mixed_via_get(event_loop): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/publish/object_via_get.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']) @pytest.mark.asyncio def test_publish_object_via_get(event_loop): @@ -73,7 +73,7 @@ def test_publish_object_via_get(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_mixed_via_post(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -88,7 +88,7 @@ def test_publish_mixed_via_post(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/object_via_post.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'query', 'object_in_body']) @pytest.mark.asyncio def test_publish_object_via_post(event_loop): @@ -100,7 +100,7 @@ def test_publish_object_via_post(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_mixed_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop) @@ -115,7 +115,7 @@ def test_publish_mixed_via_get_encrypted(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['host', 'method', 'query', 'object_in_path'], match_on_kwargs={'object_in_path': { 'decrypter': gen_decrypt_func('testKey')}}) @@ -129,7 +129,7 @@ def test_publish_object_via_get_encrypted(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'path', 'query', 'body']) @pytest.mark.asyncio def test_publish_mixed_via_post_encrypted(event_loop): @@ -145,7 +145,7 @@ def test_publish_mixed_via_post_encrypted(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'path', 'query', 'object_in_body'], match_on_kwargs={'object_in_body': { 'decrypter': gen_decrypt_func('testKey')}}) @@ -186,7 +186,7 @@ def method(): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/meta_object.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['host', 'method', 'path', 'meta_object_in_query']) @pytest.mark.asyncio def test_publish_with_meta(event_loop): @@ -198,7 +198,7 @@ def test_publish_with_meta(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/do_not_store.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_publish_do_not_store(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) @@ -217,7 +217,7 @@ def assert_server_side_error_yield(pub, expected_err_msg): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/invalid_key.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @pytest.mark.asyncio def test_error_invalid_key(event_loop): conf = PNConfiguration() @@ -233,7 +233,7 @@ def test_error_invalid_key(event_loop): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/publish/not_permitted.yaml', - filter_query_parameters=['uuid', 'seqn', 'signature', 'timestamp']) + filter_query_parameters=['uuid', 'seqn', 'signature', 'timestamp', 'pnsdk']) @pytest.mark.asyncio def test_not_permitted(event_loop): pnconf = pnconf_pam_copy() diff --git a/tests/integrational/asyncio/test_ssl.py b/tests/integrational/asyncio/test_ssl.py index 7f0db1e6..8da8c6ea 100644 --- a/tests/integrational/asyncio/test_ssl.py +++ b/tests/integrational/asyncio/test_ssl.py @@ -13,7 +13,7 @@ @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/secure/ssl.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_publish_string_via_get_encrypted(event_loop): pubnub = PubNubAsyncio(pnconf_ssl_copy(), custom_event_loop=event_loop) diff --git a/tests/integrational/asyncio/test_state.py b/tests/integrational/asyncio/test_state.py index c3f0ae7b..84c56b05 100644 --- a/tests/integrational/asyncio/test_state.py +++ b/tests/integrational/asyncio/test_state.py @@ -1,5 +1,7 @@ import asyncio import pytest +import logging +import pubnub as pn from pubnub.models.consumer.presence import PNSetStateResult, PNGetStateResult from pubnub.pubnub_asyncio import PubNubAsyncio @@ -8,12 +10,15 @@ from tests.integrational.vcr_helper import pn_vcr +pn.set_stream_logger('pubnub', logging.DEBUG) + + @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/state/single_channel.yaml', - filter_query_parameters=['uuid'], + filter_query_parameters=['uuid', 'pnsdk'], match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio -def test_single_channel(event_loop): +def test_single_channelx(event_loop): pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop) ch = 'test-state-asyncio-ch' pubnub.config.uuid = 'test-state-asyncio-uuid' @@ -40,7 +45,7 @@ def test_single_channel(event_loop): @get_sleeper('tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml') @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml', - filter_query_parameters=['uuid'], + filter_query_parameters=['uuid', 'pnsdk'], match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_single_channel_with_subscription(event_loop, sleeper=asyncio.sleep): @@ -81,7 +86,7 @@ def test_single_channel_with_subscription(event_loop, sleeper=asyncio.sleep): @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/state/multiple_channel.yaml', - filter_query_parameters=['uuid'], + filter_query_parameters=['uuid', 'pnsdk'], match_on=['method', 'host', 'path', 'state_object_in_query']) @pytest.mark.asyncio def test_multiple_channels(event_loop): diff --git a/tests/integrational/asyncio/test_subscribe.py b/tests/integrational/asyncio/test_subscribe.py index 47d80e63..64177e4b 100644 --- a/tests/integrational/asyncio/test_subscribe.py +++ b/tests/integrational/asyncio/test_subscribe.py @@ -17,7 +17,7 @@ def patch_pubnub(pubnub): @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_subscribe_unsubscribe(event_loop): channel = "test-subscribe-asyncio-ch" @@ -46,7 +46,8 @@ def test_subscribe_unsubscribe(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml', + filter_query_parameters=['pnsdk']) @pytest.mark.asyncio def test_subscribe_publish_unsubscribe(event_loop): pubnub_sub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -94,7 +95,8 @@ def test_subscribe_publish_unsubscribe(event_loop): pubnub_sub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml', + filter_query_parameters=['pnsdk']) @pytest.mark.asyncio def test_encrypted_subscribe_publish_unsubscribe(event_loop): pubnub = PubNubAsyncio(pnconf_enc_sub_copy(), custom_event_loop=event_loop) @@ -135,7 +137,8 @@ def test_encrypted_subscribe_publish_unsubscribe(event_loop): pubnub.stop() -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/join_leave.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/join_leave.yaml', + filter_query_parameters=['pnsdk']) @pytest.mark.asyncio def test_join_leave(event_loop): channel = "test-subscribe-asyncio-join-leave-ch" @@ -189,7 +192,7 @@ def test_join_leave(event_loop): @get_sleeper('tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_cg_subscribe_unsubscribe(event_loop, sleeper=asyncio.sleep): ch = "test-subscribe-asyncio-channel" @@ -218,7 +221,7 @@ def test_cg_subscribe_unsubscribe(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_cg_subscribe_publish_unsubscribe(event_loop, sleeper=asyncio.sleep): ch = "test-subscribe-asyncio-channel" @@ -261,7 +264,8 @@ def test_cg_subscribe_publish_unsubscribe(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml') -@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml') +@pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml', + filter_query_parameters=['pnsdk']) @pytest.mark.asyncio def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -328,6 +332,7 @@ def test_cg_join_leave(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml') @pn_vcr.use_cassette('tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml', + filter_query_parameters=['pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'string_list_in_query'], match_on_kwargs={ 'string_list_in_path': { diff --git a/tests/integrational/asyncio/test_time.py b/tests/integrational/asyncio/test_time.py index 6fcb2944..d4765181 100644 --- a/tests/integrational/asyncio/test_time.py +++ b/tests/integrational/asyncio/test_time.py @@ -8,7 +8,7 @@ @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/time/get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_time(event_loop): pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop) diff --git a/tests/integrational/asyncio/test_where_now.py b/tests/integrational/asyncio/test_where_now.py index 05a6cfac..67eca92e 100644 --- a/tests/integrational/asyncio/test_where_now.py +++ b/tests/integrational/asyncio/test_where_now.py @@ -11,7 +11,7 @@ @get_sleeper('tests/integrational/fixtures/asyncio/where_now/single_channel.yaml') @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/where_now/single_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @pytest.mark.asyncio def test_single_channel(event_loop, sleeper=asyncio.sleep): pubnub = PubNubAsyncio(pnconf_sub_copy(), custom_event_loop=event_loop) @@ -45,6 +45,7 @@ def test_single_channel(event_loop, sleeper=asyncio.sleep): @get_sleeper('tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml') @pn_vcr.use_cassette( 'tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml', + filter_query_parameters=['pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], match_on_kwargs={ 'string_list_in_path': { diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index 439c7f2b..bb54ca19 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -4,60 +4,60 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:31 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '156', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:32 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:03 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:32 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '129', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:04 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:33 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index a3346f48..7c2508f6 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -4,60 +4,60 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:28 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '187', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:29 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:01 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:30 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '129', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:02 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:31 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=a874e69e-273c-4e16-8924-14b2a1c5de72&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index b72f6bb3..786398e4 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -4,73 +4,73 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1 response: - body: {string: '[1,"Sent","14713558782056075"]'} + body: {string: '[1,"Sent","14818962866394550"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:26 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:58 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:26 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '166', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:27 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=test-channel-groups-asyncio-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:57:59 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:27 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&remove=test-channel-groups-asyncio-ch + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '134', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 16 Aug 2016 13:58:00 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:28 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?uuid=test-channel-group-asyncio-uuid2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 77874e86..2fc12228 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -4,30 +4,34 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: - body: {string: '{"t":{"t":"14714204724402473","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818966149684039","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 07:54:32 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:55 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch2,test-here-now-asyncio-ch1/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1 response: - body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": - {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": - {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-subscribe-asyncio-join-leave-ch": - {"uuids": ["0575fb6a-30eb-4d6e-919d-62c18b98e741"], "occupancy": 1}}, "total_channels": - 3, "total_occupancy": 3}, "service": "Presence"}'} + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-subscribe-asyncio-join-leave-ch": + {"uuids": ["test-subscribe-asyncio-listener"], "occupancy": 1}, "test-subscribe-asyncio-unsubscribe-all-ch1": + {"uuids": ["test-subscribe-asyncio-messenger"], "occupancy": 1}, "test-subscribe-asyncio-unsubscribe-all-ch2": + {"uuids": ["test-subscribe-asyncio-messenger"], "occupancy": 1}, "test-subscribe-asyncio-unsubscribe-all-ch3": + {"uuids": ["test-subscribe-asyncio-messenger"], "occupancy": 1}, "test-subscribe-asyncio-unsubscribe-all-ch": + {"uuids": ["test-subscribe-asyncio-messenger"], "occupancy": 1}, "test-subscribe-asyncio-ch": + {"uuids": ["fe92df45-c879-449d-a403-90a17bb9e6e6", "test-subscribe-asyncio-uuid-sub", + "test-subscribe-asyncio-uuid"], "occupancy": 3}}, "total_channels": 6, "total_occupancy": + 8}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '412', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, - 17 Aug 2016 07:54:37 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '836', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:57:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: @@ -35,14 +39,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, - 17 Aug 2016 07:54:38 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:57:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 7fc691f7..8b794206 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: - body: {string: '{"t":{"t":"14713594568087822","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818966089178163","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:57:36 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -25,8 +25,8 @@ interactions: 2, "total_occupancy": 2}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: @@ -34,14 +34,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 14:57:42 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index 70b84aea..b9b3f3b0 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -4,27 +4,27 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?tt=0 response: - body: {string: '{"t":{"t":"14713563292410522","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818966032335729","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 14:05:29 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:43 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: @@ -32,14 +32,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 16 Aug 2016 14:05:34 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml index 48aa9cef..4b45d796 100644 --- a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 response: - body: {string: '[1,"Sent","14804380609205757"]'} + body: {string: '[1,"Sent","14818963274425606"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:47:40 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:07 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=0634b345-da4b-4d16-81d1-5ddd1ec00f4a + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml new file mode 100644 index 00000000..cfc27efa --- /dev/null +++ b/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml @@ -0,0 +1,20 @@ +interactions: +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + method: GET + uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22 + response: + body: {string: '{"message":"Invalid Subscribe Key","error":true,"service":"Access + Manager","status":400} + +'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:10 + GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} + status: {code: 400, message: Bad Request} + url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 +version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future.yaml b/tests/integrational/fixtures/asyncio/invocations/future.yaml index 817c8b55..a63a360d 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future.yaml @@ -2,14 +2,14 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 response: - body: {string: '[1,"Sent","14804380577446754"]'} + body: {string: '[1,"Sent","14818963241977190"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:47:37 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:04 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=741ff192-3454-4724-9b84-af2bbf383720 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml index cccf306a..a70204f4 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml @@ -2,9 +2,9 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.2] + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.2 + uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22 response: body: {string: '{"message":"Invalid Subscribe Key","error":true,"service":"Access Manager","status":400} @@ -13,8 +13,8 @@ interactions: headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Tue, 29 Nov 2016 16:47:40 + CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:07 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} status: {code: 400, message: Bad Request} - url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.2&uuid=9cddca6b-9529-453e-b1ee-b1b9eedb21ce + url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index 0e4a2c8c..9fd1545d 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access Manager","status":200}'} @@ -12,31 +12,31 @@ interactions: Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, - 30 Sep 2016 07:28:49 GMT'} + 16 Dec 2016 13:52:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=UZG_bGO8g6qNAvny8KUhhnXkh_TpUnduhjKsD0Dl0RU=×tamp=1475220529&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=HoR4kd5kOwKqZ3RHzjVP5HdgmoWAP-L0OzGlf3pLlXA=×tamp=1481896330&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?uuid=my_uuid response: - body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{},"objects":{},"channel-groups":{}},"service":"Access + body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"history_channel":{"auths":{"blah":{"r":1,"m":0,"w":1}}}},"objects":{},"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '227', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, - 30 Sep 2016 07:28:49 GMT'} + CONTENT-LENGTH: '982', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=l1mOlkRbo_TzZNPGRllJs4SInacxQG2Zs1qlASrdfzU=×tamp=1475220529&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=3DcPzxyRzAGRUteyDwv7b7ro_GHlabAUzPtSkTtfUSU=×tamp=1481896330&uuid=my_uuid - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&uuid=my_uuid&w=0 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&r=0&uuid=my_uuid&w=0 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access Manager","status":200}'} @@ -44,7 +44,7 @@ interactions: Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, - 30 Sep 2016 07:28:50 GMT'} + 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&signature=R6a1h2SW-KDRObT_Vn68yj4UfTeUimXSZIU5yoygKQI=×tamp=1475220529&uuid=my_uuid&w=0 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&signature=0sKgzEts2pTJr7twR9Bh9wrfV46VON0yxg9E7tpgRjU=×tamp=1481896331&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index 9fee783a..1e8503a3 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 11:41:37 GMT'} + CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=51DaA0zEVL-rqgWv0mwhkkZgJsRYOSOArNmW_FDI1Xg=×tamp=1471434096&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VtYBdq4jE9aGehb765EPddcQhQbPxZ0Aqp6YjeMtJpY=×tamp=1481896333&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 11:41:37 GMT'} + CONTENT-LENGTH: '413', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=fXT2f9pwZhWWbG-Gaaa0f3l21p5yee4QO-JqrCjBkSU=×tamp=1481896333&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index 5295c836..533b7682 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 11:41:37 GMT'} + CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:14 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=0BL7IGzYqwyYwmF7F1ECWolsD2pfnLQT3V-YbPVCchA=×tamp=1471434097&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Lokw1jIF_zlAlk8VKfDZGechmTe9u6HaeSnvtaaQtXM=×tamp=1481896333&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 11:41:38 GMT'} + CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:14 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=JyDuATFiyVBoAaPPzcyVG7mVSpn3uthI4_6qmzNp8kE=×tamp=1471434097&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=ZgUT1TBwYYEChvdtr2xQS3Ln7YZD2b6R8ktUW44zbkY=×tamp=1481896334&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index c8f78cd1..f147b22d 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 09:36:11 GMT'} + CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Jb8XikUEakoxYNHDOvWo417pROjLG3sX1oYnbbfrdF0=×tamp=1471426571&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=fBB-FwdPoO45PXR9NvaTIhGagcvDHpNsMFLDwI16k0U=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=test-pam-asyncio-uuid response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '403', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 09:36:12 GMT'} + CONTENT-LENGTH: '401', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=IPTxRV9dIvs58E5v3Fl4VS4Yoq4peYX9CROeoaHcHr0=×tamp=1471426571&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=eu_KBB6V9wcllZrZ__wfKB5r8MDD6bk2PJFuHu6rYFo=×tamp=1481896332&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index 8a46dd8b..4efe7ae1 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 09:35:22 GMT'} + CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Ea98LGL3HqmuAjsnYiodEenChQW5IAtnEiq7j6wc7QQ=×tamp=1471426522&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=8liy0K_7A7VC6EcZ_lZk7pdQRlQaracysvEprI2OwnY=×tamp=1481896332&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=my_uuid response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '345', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 09:35:22 GMT'} + CONTENT-LENGTH: '401', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=KUzuYd6TeTfn3dQ4AvtFxl8qDZmKI8I2q7kNyRk9WBE=×tamp=1471426522&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=dbZkXTLoS2rBDyxhUnYv-kCbuYxyxmRzpq_Brl3xKK4=×tamp=1481896332&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml b/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml deleted file mode 100644 index fafea2f5..00000000 --- a/tests/integrational/fixtures/asyncio/pam/sign_non_pam_request.yaml +++ /dev/null @@ -1,20 +0,0 @@ -interactions: -- request: - body: null - headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] - method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=my_uuid - response: - body: {string: '{"message":"Forbidden","payload":{"channels":["blah"]},"error":true,"service":"Access - Manager","status":403} - -'} - headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, - Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, - 14 Oct 2016 12:51:06 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} - status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/blah/0/%22hi%22?seqn=1&uuid=my_uuid×tamp=1476449465&pnsdk=PubNub-Python-Asyncio%2F4.0.3 -version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index 8a04280b..259b3099 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&uuid=my_uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:52 GMT'} + CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=zG6ZazohUxDorfsRvu7NEjILp-9meyWFDQRcUYs5txo=×tamp=1471423672&uuid=my_uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VbXpLZNb0qIVR7W5vNsq9xzO8Pbl-TVq2emBPu6TkVg=×tamp=1481896331&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=my_uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&uuid=my_uuid response: - body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:53 GMT'} + CONTENT-LENGTH: '282', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=IBN5SIxPY_A2D4T6TGaArXRgAdLj0XHxlmDZt2SmCBs=×tamp=1471423672&uuid=my_uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=D_DmhzxnuCBeA15JtmXgjTTMvbXg_5ZZ-azpArQSAQc=×tamp=1481896331&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index ac55b86f..70a27865 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:53 GMT'} + CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=-PmvbhrZpSABb_DoTnctiSMfvM13kG9V7TCh1E8BTHU=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=BmTSr5gdDP3UkBWaSLt4mBEC9rFFZjNJRR9g_tCxLEQ=×tamp=1481896332&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid response: - body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access + body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:53 GMT'} + CONTENT-LENGTH: '294', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=mf05P6F8G8Dygn-_u4KbwoCzIbO_7qNQ-VD5-D-56Nc=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=S5p2eOGJ6fXtWge3VGpdwzti7pVNAbUZ05Wb3famUig=×tamp=1481896332&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index a233f18c..407bf937 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:54 GMT'} + CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=NmsY3rRWajoo4pwQL9IfE3_zZ1evSpb6wllm-_8xvFo=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=5TUABkdYUy7WHzCCKrU9H3vPuPZ2gHZAeaDcl7eMA54=×tamp=1481896333&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:54 GMT'} + CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PE7CpAWFfkkZteiyI78YkLg5CfEN8gLqW1cPuWjQ4Po=×tamp=1471423674&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PlsjUwIg9fE8aGoFJ8exIdRAdX9w58jiU5LiEchEV4U=×tamp=1481896333&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index 3f1f99da..9d4f7bf0 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -4,31 +4,31 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:53 GMT'} + CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=J_ytJScmc0_XzeEtkYBbCZXCPzti8f9e7tSylKNzDY0=×tamp=1471423673&uuid=test-pam-asyncio-uuid&w=1 + url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=F4zNd7p_UsQrl_v2vzhJz-ONitOhGhNENOkpddiaxPw=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, - CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Wed, - 17 Aug 2016 08:47:53 GMT'} + CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, + 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=lD4iemg38ddnPsa5KOCNd8jO-BxNgN9KVicRS6es6Z8=×tamp=1471423673&uuid=test-pam-asyncio-uuid + url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=zuuexSpQPVHApIDglAa2RRJFUycU2nvya_GshRBd8V0=×tamp=1481896331&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index 875e5ab7..0d229f74 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?store=0 response: - body: {string: '[1,"Sent","14715124518965795"]'} + body: {string: '[1,"Sent","14820978549499111"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:27:31 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&store=0&uuid=4df3cc19-fa1d-43f6-84cb-506555f9a44d&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&store=0&uuid=dc05f6a6-e648-4cf1-bbfa-b212ef5945e6&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index 7cc53655..8f3988d9 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22 response: - body: {string: '[0,"Invalid Key","14715121286597316"]'} + body: {string: '[0,"Invalid Key","14820978550352022"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:22:08 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:55 GMT'} status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=93bf8503-9330-438a-9bd7-8826b8aa00ad + url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=67af3c55-453e-45f7-bdbd-294d5499cd88&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index 0f0592ad..6a5a6376 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D response: - body: {string: '[1,"Sent","14715122016841196"]'} + body: {string: '[1,"Sent","14820978548732558"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:23:21 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?uuid=e46f1c60-c16c-4703-b9d1-0d4831c6fbd8&pnsdk=PubNub-Python-Asyncio%2F4.0.3&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=5cf73370-124e-4bc0-8d93-ce450d3dbfe3&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index 6560e644..ae572e6e 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D response: - body: {string: '[1,"Sent","14714531073577558"]'} + body: {string: '[1,"Sent","14820978538596935"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=4&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22 response: - body: {string: '[1,"Sent","14714531073592350"]'} + body: {string: '[1,"Sent","14820978538628289"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?seqn=1&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true response: - body: {string: '[1,"Sent","14714531073603443"]'} + body: {string: '[1,"Sent","14820978538632877"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?seqn=3&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5 response: - body: {string: '[1,"Sent","14714531073604938"]'} + body: {string: '[1,"Sent","14820978541276088"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?uuid=0129ac4f-42a4-456e-b37d-4f3a85e539a1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?seqn=2&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index d872e144..69e63bcb 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22 response: - body: {string: '[1,"Sent","14715101539265931"]'} + body: {string: '[1,"Sent","14820978544948351"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22 response: - body: {string: '[1,"Sent","14715101539286406"]'} + body: {string: '[1,"Sent","14820978544961915"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=4&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22 response: - body: {string: '[1,"Sent","14715101539293096"]'} + body: {string: '[1,"Sent","14820978545058783"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=2 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22 response: - body: {string: '[1,"Sent","14715101539315353"]'} + body: {string: '[1,"Sent","14820978545186148"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:49:13 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?uuid=e6b22aee-ab43-4b86-99cc-f9aba1de9ff0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=4 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=3&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index a2439d7c..21701de5 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14714531007838319"]'} + body: {string: '[1,"Sent","14820978543080292"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"hi"' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14714531007890145"]'} + body: {string: '[1,"Sent","14820978543212753"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: - body: '5' + body: '["hi", "hi2", "hi3"]' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14714531007894502"]'} + body: {string: '[1,"Sent","14820978543265053"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: - body: '["hi", "hi2", "hi3"]' + body: '5' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14714531007926933"]'} + body: {string: '[1,"Sent","14820978543321181"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:20 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?uuid=28e42ac9-5d4a-4cbe-8cd9-332225805094&seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index f23e3167..44a5314c 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -1,54 +1,54 @@ interactions: - request: - body: '"Dt7qBesIhJT2DweUJc2HRQ=="' + body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14715113500557815"]'} + body: {string: '[1,"Sent","14820978546823218"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14715113500599883"]'} + body: {string: '[1,"Sent","14820978546834160"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: - body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' + body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14715113500607388"]'} + body: {string: '[1,"Sent","14820978546866887"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14715113500616628"]'} + body: {string: '[1,"Sent","14820978546879220"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:10 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=4b1882eb-7693-4d2f-8675-5f830efaee15 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index 8f5a8294..dd5ca8b7 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -4,12 +4,17 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3×tamp=1476628727 + uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22 response: - body: {string: '[1,"Sent","14766287276539619"]'} - headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Sun, 16 Oct 2016 14:38:47 GMT'} - status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3×tamp=1476628727&seqn=1&signature=w0RglB1ksSdd8OHe7g-oIqbSfb7HpmE-nfM3SAbWT9A=&uuid=daf290a7-84c5-4cfe-8586-d8b71ca4990e + body: {string: '{"message":"Forbidden","payload":{"channels":["asyncio-int-publish"]},"error":true,"service":"Access + Manager","status":403} + +'} + headers: {ACCESS-CONTROL-ALLOW-HEADERS: 'Origin, X-Requested-With, Content-Type, + Accept', ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', + CACHE-CONTROL: 'no-cache, no-store, must-revalidate', CONNECTION: keep-alive, + CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Sun, + 18 Dec 2016 21:50:55 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} + status: {code: 403, message: Forbidden} + url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=48600fc7-b3ea-487e-abdc-622c3feec615&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index b96c3ac2..d7cfb0d0 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D response: - body: {string: '[1,"Sent","14714531074414363"]'} + body: {string: '[1,"Sent","14820978542248113"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:58:27 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?uuid=56e4665a-b68a-44a6-bc5c-be2c8a546cdc&pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=be0961fa-1d5e-43ec-83f4-39c8cd91f046&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index 5efc4dd7..74fc208f 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22 response: - body: {string: '[1,"Sent","14715102088417575"]'} + body: {string: '[1,"Sent","14820978545989239"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 08:50:08 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=c1f99aa8-b9d5-4ab1-8221-836f0b850301&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=3487ec85-56c6-4696-b781-3c6f958da670&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index 1d1fc567..283d22c7 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14714530475966145"]'} + body: {string: '[1,"Sent","14820978544115848"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 16:57:27 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=f70c150a-77b0-47b9-98ed-91f99db5cdb1&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=73b4e16c-38ee-4d54-99f3-2dd4b7f85169&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index b8e4387b..d9f46171 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: - body: {string: '[1,"Sent","14715113905714923"]'} + body: {string: '[1,"Sent","14820978547800881"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Thu, 18 Aug 2016 09:09:50 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=57cdf379-0288-4940-b947-fbb7bcf1643b&seqn=1 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=174a9cbe-2737-4184-9888-c4cfe6767ed5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index afec906b..8e89cf8d 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1 response: - body: {string: '[1,"Sent","14714344166454996"]'} + body: {string: '[1,"Sent","14818963356429731"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:46:56 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:15 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=9a743e1e-8fb3-414d-962f-124069cb8db2 + url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=784bc904-18af-4e75-981e-bd8e6bfbeb61&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index 463b4a55..389c429a 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -4,14 +4,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, - 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:29 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: @@ -26,8 +26,8 @@ interactions: "Alex"}}}, "service": "Presence", "uuid": "test-state-asyncio-uuid"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, - 11 Aug 2016 20:08:21 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:29 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index 29e02c98..9cca12c6 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -4,16 +4,16 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, - 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: @@ -26,8 +26,8 @@ interactions: "test-state-asyncio-ch"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, - 11 Aug 2016 20:06:08 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 3f0c7bf2..25a45ca5 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -4,114 +4,114 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0 response: - body: {string: '{"t":{"t":"14724899162046665","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14820964868757435","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Mon, 29 Aug 2016 16:58:36 GMT'} + charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:58:45 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:58:47 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:58:52 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:58:57 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&heartbeat=12 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:27 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "test-state-asyncio-ch"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:58:58 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:27 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Mon, - 29 Aug 2016 16:59:01 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, + 18 Dec 2016 21:28:28 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index cc68d587..7b43a307 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -4,130 +4,130 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tt=0&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381218848996","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963663448174","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:41 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:46 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511480343359 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963663448174&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381228739104","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381227916797","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": - "join", "timestamp": 1480438122, "uuid": "test-subscribe-asyncio-listener", + body: {string: '{"t":{"t":"14818963671558888","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963670791786","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "join", "timestamp": 1481896367, "uuid": "test-subscribe-asyncio-listener", "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:42 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511480343359 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963663448174&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group&tt=0&uuid=test-subscribe-asyncio-messenger response: - body: {string: '{"t":{"t":"14804381228085803","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963670970002","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:42 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511489324977 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963671558888&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381239018013","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381238546954","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": - "join", "timestamp": 1480438123, "uuid": "test-subscribe-asyncio-messenger", + body: {string: '{"t":{"t":"14818963680969905","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963680505104","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "join", "timestamp": 1481896368, "uuid": "test-subscribe-asyncio-messenger", "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:43 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511489324977 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963671558888&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963680969905&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381241719258","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381240847317","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": - "leave", "timestamp": 1480438124, "uuid": "test-subscribe-asyncio-messenger", + body: {string: '{"t":{"t":"14818963683554558","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963682712656","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": + "leave", "timestamp": 1481896368, "uuid": "test-subscribe-asyncio-messenger", "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-cg-group-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963680969905&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511498339636 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511498339636 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-listener response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:44 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?uuid=test-subscribe-asyncio-messenger&remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 04e512cf..0c8a7820 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -4,83 +4,83 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:39 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 response: - body: {string: '{"t":{"t":"14804381203881897","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963649240210","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?seqn=1 response: - body: {string: '[1,"Sent","14804381205540482"]'} + body: {string: '[1,"Sent","14818963650918583"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511466073676 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tr=12&tt=14818963649240210 response: - body: {string: '{"t":{"t":"14804381205566384","r":12},"m":[{"a":"2","f":0,"i":"61a0f363-4410-49e0-a39c-d2c434fa3bf2","s":1,"p":{"t":"14804381205540482","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} + body: {string: '{"t":{"t":"14818963650918833","r":12},"m":[{"a":"2","f":0,"i":"816d9356-41d0-4b1d-ba5c-b3488822ab64","s":1,"p":{"t":"14818963650918583","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=12&uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14713511466073676 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963649240210&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&tr=12&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:40 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:40 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f73c5107-519c-42fd-b1e1-7f9377430082&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 6a484cc1..84062575 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -4,57 +4,57 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:35 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:40 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 response: - body: {string: '{"t":{"t":"14804381189328753","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963632209414","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:39 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:39 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&channel-group=test-subscribe-asyncio-group&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:39 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?uuid=f33740e3-1b23-44c0-928b-6a5b8bc4dbe0&remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index ca86a6a9..e1e79bc8 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -4,100 +4,100 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tt=0&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381132074397","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963579052943","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:33 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?uuid=test-subscribe-asyncio-listener&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963579052943&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381141119432","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381140551040","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": - "join", "timestamp": 1480438114, "uuid": "test-subscribe-asyncio-listener", + body: {string: '{"t":{"t":"14818963588185526","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963587725382","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "join", "timestamp": 1481896358, "uuid": "test-subscribe-asyncio-listener", "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:34 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713498789397698&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963579052943 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?tt=0&uuid=test-subscribe-asyncio-messenger response: - body: {string: '{"t":{"t":"14804381140699396","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963587880346","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:34 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?uuid=test-subscribe-asyncio-messenger&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963588185526&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14713511417273344","r":3},"m":[{"a":"2","f":0,"p":{"t":"14713511416890203","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": - "join", "timestamp": 1471351141, "uuid": "test-subscribe-asyncio-messenger", - "occupancy": 3},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + body: {string: '{"t":{"t":"14818963592503447","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963592048448","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "join", "timestamp": 1481896359, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 16 Aug 2016 12:39:01 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511412634058&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963588185526 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963592503447&uuid=test-subscribe-asyncio-listener response: - body: {string: '{"t":{"t":"14804381152084812","r":12},"m":[{"a":"2","f":0,"p":{"t":"14804381149869623","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": - "join", "timestamp": 1480438114, "uuid": "test-subscribe-asyncio-messenger", - "occupancy": 2},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} + body: {string: '{"t":{"t":"14818963595693130","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963594851376","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": + "leave", "timestamp": 1481896359, "uuid": "test-subscribe-asyncio-messenger", + "occupancy": 1},"b":"test-subscribe-asyncio-join-leave-ch-pnpres"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:35 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '354', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=3&uuid=test-subscribe-asyncio-listener&tt=14713511417273344&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963592503447 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:35 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:39 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:35 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:40 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index ab0d3b7f..68239177 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -4,38 +4,53 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-uuid-sub + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid-sub response: - body: {string: '{"t":{"t":"14804365171764948","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14818963571353315","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-uuid-sub + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=test-subscribe-asyncio-uuid-pub + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-subscribe-asyncio-uuid-pub response: - body: {string: '[1,"Sent","14804367695440930"]'} + body: {string: '[1,"Sent","14818963573025400"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&seqn=1&uuid=test-subscribe-asyncio-uuid-pub + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-pub&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963571353315&uuid=test-subscribe-asyncio-uuid-sub response: - body: {string: '{"t":{"t":"14804367695447711","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14804367695440930","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} + body: {string: '{"t":{"t":"14818963573055360","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14818963573025400","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tr=12&tt=14786823981211583&uuid=test-subscribe-asyncio-uuid-sub + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tr=12&tt=14818963571353315 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + method: GET + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid-sub + response: + body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": + "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index e7dff13b..91250fb7 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -4,53 +4,53 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid response: - body: {string: '{"t":{"t":"14804367695447711","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14818963573055360","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=test-subscribe-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&uuid=test-subscribe-asyncio-uuid response: - body: {string: '[1,"Sent","14804367698742741"]'} + body: {string: '[1,"Sent","14818963577217258"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?uuid=test-subscribe-asyncio-uuid&seqn=1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963573055360&uuid=test-subscribe-asyncio-uuid response: - body: {string: '{"t":{"t":"14804367698711870","r":3},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14804367698742741","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} + body: {string: '{"t":{"t":"14818963577286072","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14818963577217258","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '247', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '249', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=3&uuid=test-subscribe-asyncio-uuid&tt=14713511400418859&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tr=12&tt=14818963573055360 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:26:10 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index b030649b..2af77f64 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -4,27 +4,27 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0 response: - body: {string: '{"t":{"t":"14804365171764948","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14818963568306880","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:26:09 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:26:09 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=0698f98a-798d-4ec3-a32a-e1560e50a6b9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index 33a726ef..bd4a0977 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -4,13 +4,13 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger @@ -19,13 +19,13 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:44 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger @@ -34,41 +34,41 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&tt=0&uuid=test-subscribe-asyncio-messenger response: - body: {string: '{"t":{"t":"14804381257627685","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963699240141","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:45 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, - 29 Nov 2016 16:48:46 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2,test-subscribe-asyncio-unsubscribe-all-ch3/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr1,test-subscribe-asyncio-unsubscribe-all-gr2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:46 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger @@ -77,13 +77,13 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '79', - CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Tue, 29 Nov 2016 16:48:46 + CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index c379c5d5..c9d18650 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/time/0 response: - body: {string: '[14766398773102530]'} + body: {string: '[14818963707386265]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Sun, 16 Oct 2016 17:44:37 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=1517d268-4797-4fcb-941c-0f862e61399f + url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index 1d4e01ee..6f032f45 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -4,42 +4,42 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?tt=0&uuid=test-where-now-asyncio-uuid response: - body: {string: '{"t":{"t":"14714362383675346","r":3},"m":[]}'} + body: {string: '{"t":{"t":"14818963736399219","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', - CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '44', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 12:17:18 GMT'} + CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch2,test-where-now-asyncio-ch1/0?uuid=test-where-now-asyncio-uuid&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, - 17 Aug 2016 12:17:25 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:53:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, - 17 Aug 2016 12:17:26 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:53:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index 689853b2..bd9ef743 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -4,27 +4,27 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?tt=0 response: - body: {string: '{"t":{"t":"14714351489282409","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14818963708992326","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Wed, 17 Aug 2016 11:59:09 GMT'} + charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:51 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-where-now-asyncio-uuid + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, - 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:53 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid - request: @@ -32,14 +32,14 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Wed, - 17 Aug 2016 11:59:11 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, + 16 Dec 2016 13:52:53 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index 53ca296e..8ad581a5 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:09 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:16 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,7 +31,31 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Sun, 18 Dec 2016 22:25:16 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.3] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -45,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['150'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:10 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:17 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +93,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:10 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:17 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,7 +104,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} @@ -93,7 +117,7 @@ interactions: Connection: [keep-alive] Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:11 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:19 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index 433bd77e..510b3f6f 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:12 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:19 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,7 +31,31 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Sun, 18 Dec 2016 22:25:19 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.3] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -45,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['178'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:13 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:20 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +93,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:13 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:20 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,7 +104,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} @@ -93,7 +117,7 @@ interactions: Connection: [keep-alive] Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:40:14 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:21 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 8c7b38ba..e5b44fae 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Sun, 21 Aug 2016 15:58:18 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:21 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,7 +31,31 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch + response: + body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + "error": false}'} + headers: + Accept-Ranges: [bytes] + Access-Control-Allow-Methods: [GET] + Access-Control-Allow-Origin: ['*'] + Age: ['0'] + Cache-Control: [no-cache] + Connection: [keep-alive] + Content-Length: ['79'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Sun, 18 Dec 2016 22:25:21 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: ['*/*'] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [PubNub-Python/4.0.3] + method: GET + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": @@ -45,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['154'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Sun, 21 Aug 2016 15:58:20 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:23 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-native-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +93,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Sun, 21 Aug 2016 15:58:20 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:23 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,7 +104,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} @@ -93,7 +117,7 @@ interactions: Connection: [keep-alive] Content-Length: ['128'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Sun, 21 Aug 2016 15:58:22 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:26 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 64504be4..69b50134 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?seqn=1 response: - body: {string: '[1,"Sent","14694610268707663"]'} + body: {string: '[1,"Sent","14820999261239656"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,7 +17,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Mon, 25 Jul 2016 15:37:06 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:26 GMT'] status: {code: 200, message: OK} - request: body: null @@ -27,9 +27,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?pnsdk=PubNub-Python%2F4.0.3&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?seqn=2 response: - body: {string: '[1,"Sent","14694610269494321"]'} + body: {string: '[1,"Sent","14820999261946479"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -37,7 +37,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Mon, 25 Jul 2016 15:37:06 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:26 GMT'] status: {code: 200, message: OK} - request: body: null @@ -47,9 +47,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?pnsdk=PubNub-Python%2F4.0.3&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?seqn=3 response: - body: {string: '[1,"Sent","14694610270571781"]'} + body: {string: '[1,"Sent","14820999262698311"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -57,7 +57,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Mon, 25 Jul 2016 15:37:07 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:26 GMT'] status: {code: 200, message: OK} - request: body: null @@ -67,9 +67,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?pnsdk=PubNub-Python%2F4.0.3&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?seqn=4 response: - body: {string: '[1,"Sent","14694610271664959"]'} + body: {string: '[1,"Sent","14820999263462219"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -77,7 +77,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Mon, 25 Jul 2016 15:37:07 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:26 GMT'] status: {code: 200, message: OK} - request: body: null @@ -87,9 +87,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?pnsdk=PubNub-Python%2F4.0.3&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?seqn=5 response: - body: {string: '[1,"Sent","14694610272640835"]'} + body: {string: '[1,"Sent","14820999264622346"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -97,7 +97,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Mon, 25 Jul 2016 15:37:07 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:26 GMT'] status: {code: 200, message: OK} - request: body: null @@ -107,9 +107,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 response: - body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14694610268707663,14694610272640835]'} + body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14820999261239656,14820999264622346]'} headers: Accept-Ranges: [bytes] Access-Control-Allow-Methods: [GET] @@ -119,7 +119,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Mon, 25 Jul 2016 15:37:12 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:31 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index 3cb09104..4634d73d 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?seqn=1 response: - body: {string: '[1,"Sent","14695248164027962"]'} + body: {string: '[1,"Sent","14820999316486003"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,7 +17,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:31 GMT'] status: {code: 200, message: OK} - request: body: null @@ -27,9 +27,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=2 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?seqn=2 response: - body: {string: '[1,"Sent","14695248165146799"]'} + body: {string: '[1,"Sent","14820999317435640"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -37,7 +37,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:31 GMT'] status: {code: 200, message: OK} - request: body: null @@ -47,9 +47,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?seqn=3 response: - body: {string: '[1,"Sent","14695248166152452"]'} + body: {string: '[1,"Sent","14820999318312588"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -57,7 +57,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:31 GMT'] status: {code: 200, message: OK} - request: body: null @@ -67,9 +67,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=4 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?seqn=4 response: - body: {string: '[1,"Sent","14695248167059434"]'} + body: {string: '[1,"Sent","14820999319032490"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -77,7 +77,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:31 GMT'] status: {code: 200, message: OK} - request: body: null @@ -87,9 +87,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=5 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?seqn=5 response: - body: {string: '[1,"Sent","14695248167891717"]'} + body: {string: '[1,"Sent","14820999319748646"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -97,7 +97,7 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Tue, 26 Jul 2016 09:20:16 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:31 GMT'] status: {code: 200, message: OK} - request: body: null @@ -107,9 +107,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 response: - body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14695248164027962,14695248167891717]'} + body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14820999316486003,14820999319748646]'} headers: Accept-Ranges: [bytes] Access-Control-Allow-Methods: [GET] @@ -119,7 +119,7 @@ interactions: Connection: [keep-alive] Content-Length: ['174'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Tue, 26 Jul 2016 09:20:21 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index dbb492c7..66be23a3 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -7,20 +7,19 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&signature=DFG6A6mYSj-s8dj3w_cQNBJdMCPCYeHLpiAgeIbCb-g%3D×tamp=1482099937 response: - body: {string: '{"message":"Forbidden","payload":{"channels":["history-native-sync-ch"]},"error":true,"service":"Access - Manager","status":403} - -'} + body: {string: '[[],0,0]'} headers: - Access-Control-Allow-Headers: ['Origin, X-Requested-With, Content-Type, Accept'] + Accept-Ranges: [bytes] Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] - Cache-Control: ['no-cache, no-store, must-revalidate'] + Age: ['0'] + Cache-Control: [no-cache] Connection: [keep-alive] - Content-Type: [text/javascript; charset=UTF-8] - Date: ['Sat, 08 Oct 2016 21:54:31 GMT'] - X-Blocks-Enabled: ['0'] - status: {code: 403, message: Forbidden} + Content-Length: ['8'] + Content-Type: [text/javascript; charset="UTF-8"] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] + Server: [Pubnub] + status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index 70e3e890..9860f2e0 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?seqn=1 response: - body: {string: '[0,"Invalid Key","14691119692918567"]'} + body: {string: '[0,"Invalid Key","14820999375199241"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['37'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] status: {code: 400, message: INVALID} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index 1e981019..e77e0680 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -9,7 +9,7 @@ interactions: method: GET uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: - body: {string: '[1,"Sent","14691119695085971"]'} + body: {string: '[1,"Sent","14820999376228286"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index 9bad08dc..cd66c5f2 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - dHJ1ZQ== + body: 'true' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['4'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: - body: {string: '[1,"Sent","14691119697248854"]'} + body: {string: '[1,"Sent","14820999377437961"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index 25515039..90d357a0 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1&store=0 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&store=0 response: - body: {string: '[1,"Sent","14691119699221362"]'} + body: {string: '[1,"Sent","14820999378413753"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:29 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index 7a402a29..e17858b6 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?seqn=1 response: - body: {string: '[1,"Sent","14691119701316179"]'} + body: {string: '[1,"Sent","14820999379661923"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:37 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index ae7345cf..9c79a160 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - Ik0xU2NSdUtYQ0tmTC9DUVRUV25zdkEzSmVXZWhjMUNwMkFENWRtUGw0YzQ9Ig== + body: '"M1ScRuKXCKfL/CQTTWnsvA3JeWehc1Cp2AD5dmPl4c4="' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['46'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: - body: {string: '[1,"Sent","14691119703765115"]'} + body: {string: '[1,"Sent","14820999380905641"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index 8892b37e..f6ed86a7 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?seqn=1 response: - body: {string: '[1,"Sent","14691119705911160"]'} + body: {string: '[1,"Sent","14820999381884038"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index 47bb6c66..eb99f6dd 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - Ilg2KzNQbTJpckVJVXRtRmlzcGNtZXM0WHZsYUJyaUlsR2cycGpHOFQ2ZWc9Ig== + body: '"X6+3Pm2irEIUtmFispcmes4XvlaBriIlGg2pjG8T6eg="' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['46'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: - body: {string: '[1,"Sent","14691119708241133"]'} + body: {string: '[1,"Sent","14820999383119516"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:30 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index bd674a5c..29f14e71 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?seqn=1 response: - body: {string: '[1,"Sent","14691119710341756"]'} + body: {string: '[1,"Sent","14820999384088589"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index 47754801..46933a2e 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - NQ== + body: '5' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['1'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: - body: {string: '[1,"Sent","14691119712785973"]'} + body: {string: '[1,"Sent","14820999385319018"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index 6cc52f30..fe8da0fa 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1 response: - body: {string: '[1,"Sent","14691119714790991"]'} + body: {string: '[1,"Sent","14820999386271370"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index 1a51e628..a2356260 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - WyJoaSIsICJoaTIiLCAiaGkzIl0= + body: '["hi", "hi2", "hi3"]' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['20'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: - body: {string: '[1,"Sent","14691119717175739"]'} + body: {string: '[1,"Sent","14820999387500502"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:31 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index 8b51b237..f8bf00fd 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D response: - body: {string: '[1,"Sent","14691173575177499"]'} + body: {string: '[1,"Sent","14820999388469350"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 16:09:17 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 387141ab..4f76664f 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - eyJuYW1lIjogIkFsZXgiLCAib25saW5lIjogdHJ1ZX0= + body: '{"online": true, "name": "Alex"}' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['32'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0 response: - body: {string: '[1,"Sent","14691119720483041"]'} + body: {string: '[1,"Sent","14820999389689577"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:32 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:38 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index ae26531e..e71277f1 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 response: - body: {string: '[1,"Sent","14703077680843249"]'} + body: {string: '[1,"Sent","14820999390622229"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 04 Aug 2016 10:49:28 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:39 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index 086e030e..d539887f 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -1,7 +1,6 @@ interactions: - request: - body: !!binary | - ImhpIg== + body: '"hi"' headers: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] @@ -9,9 +8,9 @@ interactions: Content-Length: ['4'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: - body: {string: '[1,"Sent","14691119724317947"]'} + body: {string: '[1,"Sent","14820999391849243"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -19,6 +18,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:39:32 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:39 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index dd47a7d1..a4624527 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22b%22%3A+%22qwer%22%2C+%22a%22%3A+2%7D&seqn=1 response: - body: {string: '[1,"Sent","14691124461710414"]'} + body: {string: '[1,"Sent","14820999392820954"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 14:47:26 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:39 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index 329a98f5..193ef6fa 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -7,9 +7,9 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 response: - body: {string: '[1,"Sent","14698699475874207"]'} + body: {string: '[1,"Sent","14820999394535296"]'} headers: Access-Control-Allow-Methods: [GET] Access-Control-Allow-Origin: ['*'] @@ -17,6 +17,6 @@ interactions: Connection: [keep-alive] Content-Length: ['30'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Sat, 30 Jul 2016 09:12:27 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:39 GMT'] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index c12f3d8d..786b9f89 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -19,7 +19,7 @@ interactions: Connection: [keep-alive] Content-Length: ['96'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:37:44 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:39 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": @@ -44,7 +44,7 @@ interactions: Connection: [keep-alive] Content-Length: ['228'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:37:45 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:40 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index a43a985b..0042cbd2 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -19,7 +19,7 @@ interactions: Connection: [keep-alive] Content-Length: ['96'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:37:45 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:40 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} @@ -43,7 +43,7 @@ interactions: Connection: [keep-alive] Content-Length: ['165'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 17:37:46 GMT'] + Date: ['Sun, 18 Dec 2016 22:25:40 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index 4f3bf0c4..9591ceb4 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:17:22 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:44 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -45,7 +45,7 @@ interactions: Connection: [keep-alive] Content-Length: ['150'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:17:23 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:45 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:17:23 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:45 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} @@ -93,7 +93,7 @@ interactions: Connection: [keep-alive] Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:17:24 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:46 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index 7cb2bdbb..d96a09aa 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:15:17 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:46 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -45,7 +45,7 @@ interactions: Connection: [keep-alive] Content-Length: ['178'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:15:18 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:47 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:15:19 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:47 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} @@ -93,7 +93,7 @@ interactions: Connection: [keep-alive] Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:15:20 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:48 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index 93c028a6..5596c9b8 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch&pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -20,7 +20,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:18:36 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:48 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -45,7 +45,7 @@ interactions: Connection: [keep-alive] Content-Length: ['150'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:18:37 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:50 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3&remove=channel-groups-unit-ch + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -69,7 +69,7 @@ interactions: Connection: [keep-alive] Content-Length: ['79'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:18:37 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:50 GMT'] Server: [Pubnub] status: {code: 200, message: OK} - request: @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} @@ -93,7 +93,7 @@ interactions: Connection: [keep-alive] Content-Length: ['126'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:18:39 GMT'] + Date: ['Mon, 19 Dec 2016 14:48:51 GMT'] Server: [Pubnub] status: {code: 200, message: OK} version: 1 diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index 07d9bbf3..34c10f43 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -19,7 +19,7 @@ interactions: Connection: [keep-alive] Content-Length: ['96'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:00:22 GMT'] + Date: ['Mon, 19 Dec 2016 14:49:18 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": @@ -44,7 +44,7 @@ interactions: Connection: [keep-alive] Content-Length: ['228'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:00:22 GMT'] + Date: ['Mon, 19 Dec 2016 14:49:18 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index 615d261a..595c9603 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?pnsdk=PubNub-Python%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -19,7 +19,7 @@ interactions: Connection: [keep-alive] Content-Length: ['96'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:00:23 GMT'] + Date: ['Mon, 19 Dec 2016 14:49:19 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid?pnsdk=PubNub-Python%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} @@ -43,7 +43,7 @@ interactions: Connection: [keep-alive] Content-Length: ['165'] Content-Type: [text/javascript; charset="UTF-8"] - Date: ['Thu, 21 Jul 2016 18:00:23 GMT'] + Date: ['Mon, 19 Dec 2016 14:49:19 GMT'] Server: [Pubnub Presence] cache-control: [no-cache] status: {code: 200, message: OK} diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index bfa3fbf7..5da7b929 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -5,29 +5,17 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel response: - body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: - - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:24 GMT'] - - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Accept-Ranges - - [bytes] - !!python/tuple - Content-Length - ['79'] - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - Server - [Pubnub] @@ -35,11 +23,23 @@ interactions: - Connection - [close] - !!python/tuple - - Age - - ['0'] + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Fri, 16 Dec 2016 11:16:03 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: @@ -48,177 +48,177 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tt=0 response: - body: {string: '{"t":{"t":"14708460251954075","r":3},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869649333428","r":12},"m":[]}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:25 GMT'] + - Content-Length + - ['45'] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Content-Length - - ['44'] + - Date + - ['Fri, 16 Dec 2016 11:16:05 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460251954075 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869649333428 response: - body: {string: '{"t":{"t":"14708460259366919","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460258668827","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": - "join", "timestamp": 1470846025, "uuid": "test-subscribe-listener", "occupancy": + body: {string: !!python/unicode '{"t":{"t":"14818869660519117","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869659745206","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "join", "timestamp": 1481886965, "uuid": "test-subscribe-listener", "occupancy": 1},"b":"subscribe-test-group-pnpres"}]}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:25 GMT'] + - Content-Length + - ['314'] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Content-Length - - ['313'] + - Date + - ['Fri, 16 Dec 2016 11:16:06 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460251954075&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869649333428&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&tt=0 response: - body: {string: '{"t":{"t":"14708460259353278","r":3},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869660187938","r":12},"m":[]}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:26 GMT'] + - Content-Length + - ['45'] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Content-Length - - ['44'] + - Date + - ['Fri, 16 Dec 2016 11:16:06 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tt=0&channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460259366919 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869660519117 response: - body: {string: '{"t":{"t":"14708460267928187","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460266713809","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": - "join", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": + body: {string: !!python/unicode '{"t":{"t":"14818869669268862","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869668806336","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "join", "timestamp": 1481886966, "uuid": "test-subscribe-messenger", "occupancy": 2},"b":"subscribe-test-group-pnpres"}]}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:26 GMT'] + - Content-Length + - ['315'] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Content-Length - - ['314'] + - Date + - ['Fri, 16 Dec 2016 11:16:06 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460259366919&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869660519117&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:27 GMT'] - - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Content-Length + - ['74'] - !!python/tuple - Accept-Ranges - [bytes] - !!python/tuple - - Content-Length - - ['74'] + - Server + - [Pubnub Presence] - !!python/tuple - Connection - [close] - !!python/tuple - - Server - - [Pubnub Presence] + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Fri, 16 Dec 2016 11:16:07 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Age - - ['0'] - !!python/tuple - Access-Control-Allow-Methods - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: @@ -227,142 +227,130 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460267928187 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869669268862 response: - body: {string: '{"t":{"t":"14708460271883006","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460269981178","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": - "leave", "timestamp": 1470846026, "uuid": "test-subscribe-messenger", "occupancy": + body: {string: !!python/unicode '{"t":{"t":"14818869671710838","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869670946160","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "leave", "timestamp": 1481886967, "uuid": "test-subscribe-messenger", "occupancy": 1},"b":"subscribe-test-group-pnpres"}]}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - Content-Length + - ['316'] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Content-Length - - ['315'] + - Date + - ['Fri, 16 Dec 2016 11:16:07 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460267928187&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869669268862&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869671710838 response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"t":{"t":"14818869675101369","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869674639626","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": + "leave", "timestamp": 1481886967, "uuid": "test-subscribe-listener", "occupancy": + 0},"b":"subscribe-test-group-pnpres"}]}'} headers: - - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:27 GMT'] - - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Accept-Ranges - - [bytes] - !!python/tuple - Content-Length - - ['74'] + - ['315'] - !!python/tuple - Connection - [close] - !!python/tuple - - Server - - [Pubnub Presence] + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Fri, 16 Dec 2016 11:16:07 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Age - - ['0'] - !!python/tuple - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869671710838&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708460271883006 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group response: - body: {string: '{"t":{"t":"14708460276100655","r":3},"m":[{"a":"2","f":0,"p":{"t":"14708460273860352","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": - "leave", "timestamp": 1470846027, "uuid": "test-subscribe-listener", "occupancy": - 0},"b":"subscribe-test-group-pnpres"}]}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:27 GMT'] + - Content-Length + - ['74'] + - !!python/tuple + - Accept-Ranges + - [bytes] + - !!python/tuple + - Server + - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Content-Length - - ['314'] + - Date + - ['Fri, 16 Dec 2016 11:16:07 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Access-Control-Allow-Methods - - [GET] + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?tr=3&tt=14708460271883006&channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-test-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel response: - body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: - - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 16:20:27 GMT'] - - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Accept-Ranges - - [bytes] - !!python/tuple - Content-Length - ['79'] - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - Server - [Pubnub] @@ -370,11 +358,23 @@ interactions: - Connection - [close] - !!python/tuple - - Age - - ['0'] + - Cache-Control + - [no-cache] + - !!python/tuple + - Date + - ['Fri, 16 Dec 2016 11:16:07 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - Access-Control-Allow-Methods - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger&remove=subscribe-test-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index cc7d74c1..d134f9b6 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -5,226 +5,226 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel response: - body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Content-Length + - ['79'] - !!python/tuple - Accept-Ranges - [bytes] - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Server - [Pubnub] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 16:03:24 GMT'] + - ['Fri, 16 Dec 2016 11:16:07 GMT'] - !!python/tuple - - Content-Length - - ['79'] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] - !!python/tuple - Age - ['0'] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&add=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 response: - body: {string: '{"t":{"t":"14708450055747125","r":3},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869687160475","r":12},"m":[]}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] + - Content-Length + - ['45'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 16:03:25 GMT'] - - !!python/tuple - - Content-Length - - ['44'] + - ['Fri, 16 Dec 2016 11:16:08 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22 response: - body: {string: '[1,"Sent","14708450057626682"]'} + body: {string: !!python/unicode '[1,"Sent","14818869688799557"]'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] + - Content-Length + - ['30'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 16:03:25 GMT'] - - !!python/tuple - - Content-Length - - ['30'] + - ['Fri, 16 Dec 2016 11:16:08 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708450055747125 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tr=12&tt=14818869687160475 response: - body: {string: '{"t":{"t":"14708450057612306","r":3},"m":[{"a":"2","f":0,"i":"881d453a-4ef5-4dc3-a5a5-be11147ae030","s":1,"p":{"t":"14708450057626682","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869688928592","r":12},"m":[{"a":"2","f":0,"i":"eb63e8cb-b81c-4ccc-b411-bb53264e3c09","s":1,"p":{"t":"14818869688799557","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] + - Content-Length + - ['275'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - - !!python/tuple - - Connection - - [close] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 16:03:25 GMT'] - - !!python/tuple - - Content-Length - - ['273'] + - ['Fri, 16 Dec 2016 11:16:08 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708450055747125&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869687160475&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Content-Length + - ['74'] - !!python/tuple - Accept-Ranges - [bytes] - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Server - [Pubnub Presence] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 16:03:26 GMT'] + - ['Fri, 16 Dec 2016 11:16:09 GMT'] - !!python/tuple - - Content-Length - - ['74'] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] - !!python/tuple - Age - ['0'] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&channel-group=subscribe-unsubscribe-group&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel response: - body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] + - Content-Length + - ['79'] - !!python/tuple - Accept-Ranges - [bytes] - - !!python/tuple - - Cache-Control - - [no-cache] - !!python/tuple - Server - [Pubnub] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 16:03:26 GMT'] + - ['Fri, 16 Dec 2016 11:16:09 GMT'] - !!python/tuple - - Content-Length - - ['79'] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] - !!python/tuple - Age - ['0'] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-unsubscribe-channel&uuid=881d453a-4ef5-4dc3-a5a5-be11147ae030 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09&remove=subscribe-unsubscribe-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index d0c86478..cbc6a2dc 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -5,160 +5,160 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel response: - body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: - - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - !!python/tuple - Content-Length - ['79'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - - Age - - ['0'] + - Server + - [Pubnub] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 15:59:05 GMT'] + - ['Fri, 16 Dec 2016 11:16:09 GMT'] - !!python/tuple - - Accept-Ranges - - [bytes] + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - - Server - - [Pubnub] + - Access-Control-Allow-Methods + - [GET] - !!python/tuple - - Cache-Control - - [no-cache] + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?uuid=2f731928-4a3a-476a-9da6-b45543673620&add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 response: - body: {string: '{"t":{"t":"14708447464037454","r":12},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869688928592","r":12},"m":[]}'} headers: - - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - !!python/tuple - Content-Length - ['45'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - !!python/tuple - Connection - [close] - - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 15:59:06 GMT'] - !!python/tuple - Cache-Control - [no-cache] + - !!python/tuple + - Date + - ['Fri, 16 Dec 2016 11:16:10 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - - !!python/tuple - - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] - !!python/tuple - Content-Length - ['74'] - !!python/tuple - - Cache-Control - - [no-cache] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - - Age - - ['0'] + - Server + - [Pubnub Presence] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 15:59:06 GMT'] + - ['Fri, 16 Dec 2016 11:16:10 GMT'] - !!python/tuple - - Accept-Ranges - - [bytes] + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - - Server - - [Pubnub Presence] + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?uuid=2f731928-4a3a-476a-9da6-b45543673620&channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=subscribe-unsubscribe-channel + uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel response: - body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", + body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: - - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - !!python/tuple - Content-Length - ['79'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Accept-Ranges + - [bytes] - !!python/tuple - - Age - - ['0'] + - Server + - [Pubnub] - !!python/tuple - Connection - [close] + - !!python/tuple + - Cache-Control + - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 15:59:06 GMT'] + - ['Fri, 16 Dec 2016 11:16:10 GMT'] - !!python/tuple - - Accept-Ranges - - [bytes] + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - - Server - - [Pubnub] + - Access-Control-Allow-Methods + - [GET] - !!python/tuple - - Cache-Control - - [no-cache] + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel&uuid=2f731928-4a3a-476a-9da6-b45543673620&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb&remove=subscribe-unsubscribe-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index f5334953..915358ba 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -5,9 +5,9 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0 response: - body: {string: !!python/unicode '{"t":{"t":"14818137719895494","r":12},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869603870494","r":12},"m":[]}'} headers: - !!python/tuple - Content-Length @@ -20,7 +20,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:40 GMT'] + - ['Fri, 16 Dec 2016 11:16:00 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -31,17 +31,17 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708438179383195 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869603870494 response: - body: {string: !!python/unicode '{"t":{"t":"14818141038141353","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141037368243","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "join", "timestamp": 1481814103, "uuid": "subscribe-tornado-listener-3", "occupancy": + body: {string: !!python/unicode '{"t":{"t":"14818869613057835","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869612281954","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1481886961, "uuid": "subscribe-tornado-listener-3", "occupancy": 1},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - !!python/tuple @@ -55,7 +55,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:43 GMT'] + - ['Fri, 16 Dec 2016 11:16:01 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -66,16 +66,16 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708438179383195&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869603870494&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: - body: {string: !!python/unicode '{"t":{"t":"14818141039599808","r":12},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869612949707","r":12},"m":[]}'} headers: - !!python/tuple - Content-Length @@ -88,7 +88,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:44 GMT'] + - ['Fri, 16 Dec 2016 11:16:01 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -99,17 +99,17 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708443090824007 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869613057835 response: - body: {string: !!python/unicode '{"t":{"t":"14818141046316706","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141045847189","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "join", "timestamp": 1481814104, "uuid": "subscribe-tornado-messenger-3", + body: {string: !!python/unicode '{"t":{"t":"14818869622225817","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869621699814","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1481886962, "uuid": "subscribe-tornado-messenger-3", "occupancy": 2},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - !!python/tuple @@ -123,7 +123,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:44 GMT'] + - ['Fri, 16 Dec 2016 11:16:02 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -134,17 +134,17 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708443090824007&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869613057835&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708443098649253 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869622225817 response: - body: {string: !!python/unicode '{"t":{"t":"14818141050377882","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141049901227","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "leave", "timestamp": 1481814104, "uuid": "subscribe-tornado-messenger-3", + body: {string: !!python/unicode '{"t":{"t":"14818869626041325","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869625576502","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "leave", "timestamp": 1481886962, "uuid": "subscribe-tornado-messenger-3", "occupancy": 1},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - !!python/tuple @@ -158,7 +158,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:45 GMT'] + - ['Fri, 16 Dec 2016 11:16:02 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -169,14 +169,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708443098649253&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869622225817&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -198,7 +198,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:45 GMT'] + - ['Fri, 16 Dec 2016 11:16:02 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -212,22 +212,22 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14708443101375638 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869626041325 response: - body: {string: !!python/unicode '{"t":{"t":"14818141055223535","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818141054743525","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": - "leave", "timestamp": 1481814105, "uuid": "subscribe-tornado-listener-3", - "occupancy": 0},"b":"subscribe-tornado-ch-pnpres"}]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869630029993","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869628593295","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": + "join", "timestamp": 1481886962, "uuid": "subscribe-tornado-listener-3", "occupancy": + 1},"b":"subscribe-tornado-ch-pnpres"}]}'} headers: - !!python/tuple - Content-Length - - ['318'] + - ['317'] - !!python/tuple - Connection - [close] @@ -236,7 +236,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:45 GMT'] + - ['Fri, 16 Dec 2016 11:16:03 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -247,14 +247,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708443101375638&uuid=subscribe-tornado-listener&tr=12 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869626041325&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -276,7 +276,7 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Thu, 15 Dec 2016 15:01:45 GMT'] + - ['Fri, 16 Dec 2016 11:16:03 GMT'] - !!python/tuple - Access-Control-Allow-Origin - ['*'] @@ -290,5 +290,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index 453b095b..c31325a3 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -5,140 +5,140 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: - body: {string: '{"t":{"t":"14708323099136684","r":3},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869631121257","r":12},"m":[]}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Content-Length + - ['45'] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Length - - ['44'] + - Date + - ['Fri, 16 Dec 2016 11:16:03 GMT'] - !!python/tuple - - Connection - - [close] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22 response: - body: {string: '[1,"Sent","14708323101133727"]'} + body: {string: !!python/unicode '[1,"Sent","14818869633015166"]'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Content-Length + - ['30'] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Length - - ['30'] + - Date + - ['Fri, 16 Dec 2016 11:16:03 GMT'] - !!python/tuple - - Connection - - [close] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?seqn=1&uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=14708323099136684 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tr=12&tt=14818869631121257 response: - body: {string: '{"t":{"t":"14708323101140128","r":3},"m":[{"a":"2","f":0,"i":"970e123c-d9a0-45b8-b885-3dae1011bf03","s":1,"p":{"t":"14708323101133727","r":3},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869633017084","r":12},"m":[{"a":"2","f":0,"i":"18aa1154-a3bd-4e71-994d-8685b56eeecc","s":1,"p":{"t":"14818869633015166","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} headers: - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Content-Length + - ['232'] - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 12:31:50 GMT'] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Length - - ['230'] + - Date + - ['Fri, 16 Dec 2016 11:16:03 GMT'] - !!python/tuple - - Connection - - [close] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=14708323099136684&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=14818869631121257&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: + - !!python/tuple + - Content-Length + - ['74'] - !!python/tuple - Accept-Ranges - [bytes] - - !!python/tuple - - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - - !!python/tuple - - Date - - ['Wed, 10 Aug 2016 12:31:50 GMT'] - !!python/tuple - Server - [Pubnub Presence] + - !!python/tuple + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - - Content-Length - - ['74'] + - Date + - ['Fri, 16 Dec 2016 11:16:03 GMT'] - !!python/tuple - - Age - - ['0'] + - Access-Control-Allow-Origin + - ['*'] - !!python/tuple - - Connection - - [close] + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=970e123c-d9a0-45b8-b885-3dae1011bf03&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index da3d6387..b7770105 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -5,68 +5,68 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: - body: {string: '{"t":{"t":"14708323101261227","r":12},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869633017084","r":12},"m":[]}'} headers: - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] + - Content-Length + - ['45'] - !!python/tuple - Connection - [close] - - !!python/tuple - - Access-Control-Allow-Methods - - [GET] - - !!python/tuple - - Content-Length - - ['45'] - !!python/tuple - Cache-Control - [no-cache] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 12:36:27 GMT'] + - ['Fri, 16 Dec 2016 11:16:03 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - - !!python/tuple - - Connection - - [close] + - Content-Length + - ['74'] - !!python/tuple - Accept-Ranges - [bytes] - !!python/tuple - - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] + - Server + - [Pubnub Presence] - !!python/tuple - - Content-Length - - ['74'] + - Connection + - [close] - !!python/tuple - Cache-Control - [no-cache] - - !!python/tuple - - Server - - [Pubnub Presence] - !!python/tuple - Date - - ['Wed, 10 Aug 2016 12:36:27 GMT'] + - ['Fri, 16 Dec 2016 11:16:03 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] - !!python/tuple - Content-Type - [text/javascript; charset="UTF-8"] @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?uuid=d51e6d6a-f470-4a3e-96c5-3704e5cc39b5&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index 57463ac1..b09b2228 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -5,22 +5,13 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0 response: - body: {string: '{"t":{"t":"14717806990508559","r":3},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869706095939","r":12},"m":[]}'} headers: - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - !!python/tuple - Content-Length - - ['44'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Methods - - [GET] + - ['45'] - !!python/tuple - Connection - [close] @@ -29,31 +20,31 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Sun, 21 Aug 2016 11:58:19 GMT'] + - ['Fri, 16 Dec 2016 11:16:10 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 + uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tr=12&tt=0 response: - body: {string: '{"t":{"t":"14717807001063591","r":3},"m":[]}'} + body: {string: !!python/unicode '{"t":{"t":"14818869716760786","r":12},"m":[]}'} headers: - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - !!python/tuple - Content-Length - - ['44'] - - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Methods - - [GET] + - ['45'] - !!python/tuple - Connection - [close] @@ -62,40 +53,40 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Sun, 21 Aug 2016 11:58:20 GMT'] + - ['Fri, 16 Dec 2016 11:16:11 GMT'] + - !!python/tuple + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - [GET] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel3,test-here-now-channel2/0?uuid=test-here-now-uuid&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3 + url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2 response: - body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": - {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": - {"uuids": ["test-here-now-uuid"], "occupancy": 1}}, "total_channels": 2, "total_occupancy": - 2}, "service": "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": + {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": + 1}, "test-here-now-channel2": {"uuids": ["test-here-now-uuid"], "occupancy": + 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} headers: - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - - !!python/tuple - - Accept-Ranges - - [bytes] - !!python/tuple - Content-Length - ['279'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] + - Accept-Ranges + - [bytes] - !!python/tuple - - Age - - ['0'] + - Server + - [Pubnub Presence] - !!python/tuple - Connection - [close] @@ -104,41 +95,41 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Sun, 21 Aug 2016 11:58:25 GMT'] + - ['Fri, 16 Dec 2016 11:16:16 GMT'] - !!python/tuple - - Server - - [Pubnub Presence] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave response: - body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": - "Presence"}'} + body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": + "OK", "service": "Presence"}'} headers: - - !!python/tuple - - Access-Control-Allow-Origin - - ['*'] - - !!python/tuple - - Accept-Ranges - - [bytes] - !!python/tuple - Content-Length - ['74'] - !!python/tuple - - Content-Type - - [text/javascript; charset="UTF-8"] - - !!python/tuple - - Access-Control-Allow-Methods - - ['OPTIONS, GET, POST'] + - Accept-Ranges + - [bytes] - !!python/tuple - - Age - - ['0'] + - Server + - [Pubnub Presence] - !!python/tuple - Connection - [close] @@ -147,10 +138,19 @@ interactions: - [no-cache] - !!python/tuple - Date - - ['Sun, 21 Aug 2016 11:58:25 GMT'] + - ['Fri, 16 Dec 2016 11:16:17 GMT'] - !!python/tuple - - Server - - [Pubnub Presence] + - Access-Control-Allow-Origin + - ['*'] + - !!python/tuple + - Access-Control-Allow-Methods + - ['OPTIONS, GET, POST'] + - !!python/tuple + - Content-Type + - [text/javascript; charset="UTF-8"] + - !!python/tuple + - Age + - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/native_sync/test_channel_groups.py b/tests/integrational/native_sync/test_channel_groups.py index 9f88fb49..13b2d8cb 100644 --- a/tests/integrational/native_sync/test_channel_groups.py +++ b/tests/integrational/native_sync/test_channel_groups.py @@ -15,12 +15,19 @@ class TestPubNubChannelGroups(unittest.TestCase): @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_single_channel(self): ch = "channel-groups-native-ch" gr = "channel-groups-native-cg" pubnub = PubNub(pnconf_copy()) + # cleanup + envelope = pubnub.remove_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(envelope.result, PNChannelGroupsRemoveGroupResult) + # add envelope = pubnub.add_channel_to_channel_group() \ .channels(ch) \ @@ -60,13 +67,20 @@ def test_single_channel(self): @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_add_remove_multiple_channels(self): ch1 = "channel-groups-unit-ch1" ch2 = "channel-groups-unit-ch2" gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) + # cleanup + envelope = pubnub.remove_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(envelope.result, PNChannelGroupsRemoveGroupResult) + # add envelope = pubnub.add_channel_to_channel_group() \ .channels([ch1, ch2]) \ @@ -107,12 +121,19 @@ def test_add_remove_multiple_channels(self): @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_add_channel_remove_group(self): ch = "channel-groups-unit-ch" gr = "channel-groups-unit-cg" pubnub = PubNub(pnconf_copy()) + # cleanup + envelope = pubnub.remove_channel_group() \ + .channel_group(gr) \ + .sync() + + assert isinstance(envelope.result, PNChannelGroupsRemoveGroupResult) + # add envelope = pubnub.add_channel_to_channel_group() \ .channels(ch) \ diff --git a/tests/integrational/native_sync/test_history.py b/tests/integrational/native_sync/test_history.py index 3062b6d4..f96c218f 100644 --- a/tests/integrational/native_sync/test_history.py +++ b/tests/integrational/native_sync/test_history.py @@ -18,7 +18,7 @@ class TestPubNubHistory(unittest.TestCase): @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/basic.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_basic(self): ch = "history-native-sync-ch" pubnub = PubNub(pnconf_copy()) @@ -45,7 +45,7 @@ def test_basic(self): assert envelope.result.messages[4].entry == 'hey-4' @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/encoded.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_encrypted(self): ch = "history-native-sync-ch" pubnub = PubNub(pnconf_enc_copy()) @@ -72,7 +72,7 @@ def test_encrypted(self): assert envelope.result.messages[4].entry == 'hey-4' @use_cassette_and_stub_time_sleep_native('tests/integrational/fixtures/native_sync/history/not_permitted.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_not_permitted(self): ch = "history-native-sync-ch" pubnub = PubNub(pnconf_pam_copy()) diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index 6b7ea344..342977a9 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -14,7 +14,7 @@ class TestPubNubPublish(unittest.TestCase): @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_string_get(self): try: env = PubNub(pnconf).publish() \ @@ -28,7 +28,7 @@ def test_publish_string_get(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_list_get(self): try: env = PubNub(pnconf).publish() \ @@ -43,7 +43,7 @@ def test_publish_list_get(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']) def test_publish_object_get(self): try: @@ -72,7 +72,7 @@ def test_publish_bool_get(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_int_get(self): try: env = PubNub(pnconf).publish() \ @@ -86,7 +86,7 @@ def test_publish_int_get(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_encrypted_string_get(self): try: env = PubNub(pnconf_enc).publish() \ @@ -100,7 +100,7 @@ def test_publish_encrypted_string_get(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_encrypted_list_get(self): try: env = PubNub(pnconf_enc).publish() \ @@ -114,7 +114,7 @@ def test_publish_encrypted_list_get(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_string_post(self): try: env = PubNub(pnconf).publish() \ @@ -129,7 +129,7 @@ def test_publish_string_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_list_post(self): try: env = PubNub(pnconf).publish() \ @@ -144,7 +144,7 @@ def test_publish_list_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'query', 'object_in_body']) def test_publish_object_post(self): try: @@ -160,7 +160,7 @@ def test_publish_object_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_bool_post(self): try: env = PubNub(pnconf).publish() \ @@ -175,7 +175,7 @@ def test_publish_bool_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_int_post(self): try: env = PubNub(pnconf).publish() \ @@ -190,7 +190,7 @@ def test_publish_int_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_encrypted_string_post(self): try: env = PubNub(pnconf_enc).publish() \ @@ -205,7 +205,7 @@ def test_publish_encrypted_string_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_encrypted_list_post(self): try: env = PubNub(pnconf_enc).publish() \ @@ -220,7 +220,7 @@ def test_publish_encrypted_list_post(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/invalid_key.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_invalid_key(self): config = PNConfiguration() config.publish_key = "fake" @@ -233,7 +233,7 @@ def test_invalid_key(self): .message("hey") \ .sync() - self.fail(Exception("Should throw exception")) + self.fail(Exception("Should throw exception", 'pnsdk')) except PubNubException as e: assert "Invalid Key" in str(e) @@ -274,7 +274,7 @@ def func(): assert "not JSON serializable" in str(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml', - filter_query_parameters=['uuid'], match_on=['meta_object_in_query']) + filter_query_parameters=['uuid', 'pnsdk'], match_on=['meta_object_in_query']) def test_publish_with_meta(self): meta = {'a': 2, 'b': 'qwer'} @@ -291,7 +291,7 @@ def test_publish_with_meta(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_do_not_store(self): try: env = PubNub(pnconf_enc).publish() \ diff --git a/tests/integrational/native_sync/test_ssl.py b/tests/integrational/native_sync/test_ssl.py index b759a567..b000c463 100644 --- a/tests/integrational/native_sync/test_ssl.py +++ b/tests/integrational/native_sync/test_ssl.py @@ -13,7 +13,7 @@ class TestPubNubPublish(unittest.TestCase): @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/ssl/ssl.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_string_get(self): pnconf = pnconf_copy() pnconf.ssl = True diff --git a/tests/integrational/native_sync/test_state.py b/tests/integrational/native_sync/test_state.py index b5d8eedb..2e93f0e8 100644 --- a/tests/integrational/native_sync/test_state.py +++ b/tests/integrational/native_sync/test_state.py @@ -12,7 +12,7 @@ class TestPubNubState(unittest.TestCase): @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml', - filter_query_parameters=['uuid'], match_on=['state_object_in_query']) + filter_query_parameters=['uuid', 'pnsdk'], match_on=['state_object_in_query']) def test_single_channel(self): ch = "state-native-sync-ch" pubnub = PubNub(pnconf_copy()) @@ -32,7 +32,7 @@ def test_single_channel(self): assert envelope.result.channels[ch]['count'] == 5 @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml', - filter_query_parameters=['uuid'], match_on=['state_object_in_query']) + filter_query_parameters=['uuid', 'pnsdk'], match_on=['state_object_in_query']) def test_multiple_channels(self): ch1 = "state-native-sync-ch-1" ch2 = "state-native-sync-ch-2" diff --git a/tests/integrational/native_threads/test_channel_groups.py b/tests/integrational/native_threads/test_channel_groups.py index f27e97ed..60f3651a 100644 --- a/tests/integrational/native_threads/test_channel_groups.py +++ b/tests/integrational/native_threads/test_channel_groups.py @@ -24,7 +24,7 @@ def callback(self, response, status): @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_single_channel(self): ch = "channel-groups-unit-ch" gr = "channel-groups-unit-cg" @@ -78,7 +78,7 @@ def test_single_channel(self): @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_add_remove_multiple_channels(self): ch1 = "channel-groups-unit-ch1" ch2 = "channel-groups-unit-ch2" @@ -134,7 +134,7 @@ def test_add_remove_multiple_channels(self): @use_cassette_and_stub_time_sleep_native( 'tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_add_channel_remove_group(self): ch = "channel-groups-unit-ch" gr = "channel-groups-unit-cg" diff --git a/tests/integrational/native_threads/test_state.py b/tests/integrational/native_threads/test_state.py index f09dc6ce..793fc223 100644 --- a/tests/integrational/native_threads/test_state.py +++ b/tests/integrational/native_threads/test_state.py @@ -21,7 +21,7 @@ def callback(self, response, status): self.event.set() @pn_vcr.use_cassette('tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml', - filter_query_parameters=['uuid'], match_on=['state_object_in_query']) + filter_query_parameters=['uuid', 'pnsdk'], match_on=['state_object_in_query']) def test_single_channel(self): ch = "state-native-sync-ch" pubnub = PubNub(pnconf_copy()) @@ -51,7 +51,7 @@ def test_single_channel(self): assert self.response.channels[ch]['count'] == 5 @pn_vcr.use_cassette('tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml', - filter_query_parameters=['uuid'], match_on=['state_object_in_query']) + filter_query_parameters=['uuid', 'pnsdk'], match_on=['state_object_in_query']) def test_multiple_channels(self): ch1 = "state-native-sync-ch-1" ch2 = "state-native-sync-ch-2" diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index d88ae805..1b9dfb6c 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -1,11 +1,16 @@ import tornado -from tornado.testing import AsyncTestCase +import logging +import pubnub as pn +from tornado.testing import AsyncTestCase from pubnub.pubnub_tornado import PubNubTornado from tests.helper import pnconf_copy from tests.integrational.tornado.vcr_tornado_decorator import use_cassette_and_stub_time_sleep +pn.set_stream_logger('pubnub', logging.DEBUG) + + class TestPubNubState(AsyncTestCase): def setUp(self): super(TestPubNubState, self).setUp() diff --git a/tests/integrational/tornado/vcr_tornado_decorator.py b/tests/integrational/tornado/vcr_tornado_decorator.py index 7d109922..8b5cc94c 100644 --- a/tests/integrational/tornado/vcr_tornado_decorator.py +++ b/tests/integrational/tornado/vcr_tornado_decorator.py @@ -13,6 +13,9 @@ def use_cassette_and_stub_time_sleep(cassette_name, **kwargs): full_path = "{}/{}".format(pn_vcr.cassette_library_dir, cassette_name) cs = context.cls(path=full_path).load(path=full_path) + if 'filter_query_parameters' in kwargs: + kwargs['filter_query_parameters'].append('pnsdk') + import tornado.gen @tornado.gen.coroutine From 95b9e01d3f8f66719fc54efc0c57a044914b2c24 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 21 Dec 2016 06:06:02 -0800 Subject: [PATCH 433/468] Add examples --- examples/native_threads/check.py | 59 ++++++++++++++++++++++++ examples/native_threads/http/__init__.py | 0 examples/native_threads/http/app.py | 57 +++++++++++++++++++++++ examples/native_threads/publish.py | 7 ++- examples/twisted/subscribe.py | 38 +++++++++++++++ 5 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 examples/native_threads/check.py create mode 100644 examples/native_threads/http/__init__.py create mode 100644 examples/native_threads/http/app.py create mode 100644 examples/twisted/subscribe.py diff --git a/examples/native_threads/check.py b/examples/native_threads/check.py new file mode 100644 index 00000000..5ce999d7 --- /dev/null +++ b/examples/native_threads/check.py @@ -0,0 +1,59 @@ +from pubnub.callbacks import SubscribeCallback +from pubnub.enums import PNStatusCategory +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub + +pnconfig = PNConfiguration() + +pnconfig.subscribe_key = 'sub-c-a41be4e8-b620-11e5-a916-0619f8945a4f' +pnconfig.publish_key = 'pub-c-b525a8c0-3301-432e-a37b-d8fec5583788' +pnconfig.subscribe_key = 'demo' +pnconfig.publish_key = 'demo' + +pubnub = PubNub(pnconfig) + + +def my_publish_callback(envelope, status): + # Check whether request successfully completed or not + if not status.is_error(): + pass # Message successfully published to specified channel. + else: + pass # Handle message publish error. Check 'category' property to find out possible issue + + +# because of which request did fail. +# Request can be resent using: [status retry]; + + +class MySubscribeCallback(SubscribeCallback): + def presence(self, pubnub, presence): + pass # handle incoming presence data + + def status(self, pubnub, status): + print("Status category", status.category) + if status.category == PNStatusCategory.PNUnexpectedDisconnectCategory: + pass # This event happens when radio / connectivity is lost + + elif status.category == PNStatusCategory.PNConnectedCategory: + # Connect event. You can do stuff like publish, and know you'll get it. + # Or just use the connected event to confirm you are subscribed for + # UI / internal notifications, etc + pubnub.publish().channel("someChannel").message("Hi...").async(my_publish_callback) + elif status.category == PNStatusCategory.PNReconnectedCategory: + pass + # Happens as part of our regular operation. This event happens when + # radio / connectivity is lost, then regained. + elif status.category == PNStatusCategory.PNDecryptionErrorCategory: + pass + # Handle message decryption error. Probably client configured to + + # encrypt messages and on live data feed it received plain text. + + def message(self, pubnub, message): + # Handle new message stored in message.message + print(message) + pubnub.unsubscribe().channels("someChannel").execute() + + +pubnub.add_listener(MySubscribeCallback()) +pubnub.subscribe().channels('someChannel').execute() diff --git a/examples/native_threads/http/__init__.py b/examples/native_threads/http/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/examples/native_threads/http/app.py b/examples/native_threads/http/app.py new file mode 100644 index 00000000..51956d9e --- /dev/null +++ b/examples/native_threads/http/app.py @@ -0,0 +1,57 @@ +# subscribe to pubnub channel, push messages into the queue, +# queue worker send send them to cli +import logging +import os +import sys +import atexit +import signal + +d = os.path.dirname +PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) +sys.path.append(PUBNUB_ROOT) + +import pubnub as pn + +from pubnub.callbacks import SubscribeCallback +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub + +pn.set_stream_logger('pubnub', logging.DEBUG) +logger = logging.getLogger("myapp") + +pnconfig = PNConfiguration() +pnconfig.publish_key = "demo" +pnconfig.subscribe_key = "demo" + +pubnub = PubNub(pnconfig) +logger.info("SDK Version: %s", pubnub.SDK_VERSION) + +original_sigint = None + + +class MyListener(SubscribeCallback): + def presence(self, pubnub, presence): + pass + + def status(self, pubnub, status): + print("Status changed, new status: %s" % status) + + def message(self, pubnub, message): + print("Message %s" % message) + + +def subscribe(): + listener = MyListener() + pubnub.add_listener(listener) + pubnub.subscribe().channels("demo").execute() + # TODO: exception doesn't raised, but should inside status() callback + +if __name__ == '__main__': + subscribe() + +atexit.register(pubnub.unsubscribe().channels('demo').execute) +atexit.register(pubnub.stop) + +# TODO: await + +# pubnub.stop() diff --git a/examples/native_threads/publish.py b/examples/native_threads/publish.py index eb64b5be..84e1e150 100644 --- a/examples/native_threads/publish.py +++ b/examples/native_threads/publish.py @@ -1,13 +1,17 @@ # PubNub HereNow usage example import logging +import os import sys -sys.path.append("../") +d = os.path.dirname +PUBNUB_ROOT = d(d(os.path.dirname(os.path.abspath(__file__)))) +sys.path.append(PUBNUB_ROOT) import pubnub from examples import pnconf from pubnub.pubnub import PubNub, NonSubscribeListener + pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) pubnub = PubNub(pnconf) @@ -21,6 +25,7 @@ .async(listener.callback) result = listener.await_result_and_reset(5) +# FIX: returns None print(result) pubnub.stop() diff --git a/examples/twisted/subscribe.py b/examples/twisted/subscribe.py new file mode 100644 index 00000000..0ad81f43 --- /dev/null +++ b/examples/twisted/subscribe.py @@ -0,0 +1,38 @@ +# PubNub HereNow usage example +import sys + +import time + + +sys.path.append("../../") + +from pubnub.callbacks import SubscribeCallback +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub_twisted import PubNubTwisted + +pnconf = PNConfiguration() +pnconf.publish_key = "demo" +pnconf.subscribe_key = "demo" +pnconf.enable_subscribe = True + +pubnub = PubNubTwisted(pnconf) + + +class MyListener(SubscribeCallback): + def status(self, pubnub, status): + print("status changed: %s" % status) + + def message(self, pubnub, message): + print("new message: %s" % message) + + def presence(self, pubnub, presence): + pass + + +my_listener = MyListener() + + +pubnub.add_listener(my_listener) + +pubnub.subscribe().channels('my_channel').execute() +time.sleep(60) From 9ab9b3f88770c0aa2027bba881eda3470678470f Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 21 Dec 2016 06:14:18 -0800 Subject: [PATCH 434/468] Add Native Reconnection Manager --- pubnub/managers.py | 21 ++++- pubnub/pubnub.py | 101 +++++++++++++++++++-- pubnub/pubnub_asyncio.py | 16 +--- pubnub/pubnub_tornado.py | 1 - tests/manual/asyncio/test_reconnections.py | 2 +- tests/manual/native/__init__.py | 0 tests/manual/native/test_reconnection.py | 49 ++++++++++ tests/manual/tornado/subscribe_stub.py | 12 ++- tests/manual/tornado/test_reconnections.py | 2 +- 9 files changed, 178 insertions(+), 26 deletions(-) create mode 100644 tests/manual/native/__init__.py create mode 100644 tests/manual/native/test_reconnection.py diff --git a/pubnub/managers.py b/pubnub/managers.py index d2115b67..39a5cdf0 100644 --- a/pubnub/managers.py +++ b/pubnub/managers.py @@ -1,12 +1,18 @@ +import logging from abc import abstractmethod, ABCMeta -from .enums import PNStatusCategory +import math + +from . import utils +from .enums import PNStatusCategory, PNReconnectionPolicy from .models.consumer.common import PNStatus from .models.server.subscribe import SubscribeEnvelope from .dtos import SubscribeOperation, UnsubscribeOperation from .callbacks import SubscribeCallback, ReconnectionCallback from .models.subscription_item import SubscriptionItem +logger = logging.getLogger("pubnub") + class PublishSequenceManager(object): def __init__(self, provided_max_sequence): @@ -64,6 +70,19 @@ def set_reconnection_listener(self, reconnection_callback): assert isinstance(reconnection_callback, ReconnectionCallback) self._callback = reconnection_callback + def _recalculate_interval(self): + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: + self._timer_interval = int(math.pow(2, self._connection_errors) - 1) + if self._timer_interval > self.MAXEXPONENTIALBACKOFF: + self._timer_interval = self.MINEXPONENTIALBACKOFF + self._connection_errors = 1 + logger.debug("timerInterval > MAXEXPONENTIALBACKOFF at: %s" % utils.datetime_now()) + elif self._timer_interval < 1: + self._timer_interval = self.MINEXPONENTIALBACKOFF + logger.debug("timerInterval = %d at: %s" % (self._timer_interval, utils.datetime_now())) + else: + self._timer_interval = self.INTERVAL + @abstractmethod def start_polling(self): pass diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 3ff923d2..e8737ed0 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -8,12 +8,13 @@ from . import utils from .request_handlers.base import BaseRequestHandler from .request_handlers.requests_handler import RequestsRequestHandler -from .callbacks import SubscribeCallback +from .callbacks import SubscribeCallback, ReconnectionCallback from .endpoints.presence.heartbeat import Heartbeat from .endpoints.presence.leave import Leave from .endpoints.pubsub.subscribe import Subscribe -from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType -from .managers import SubscriptionManager, PublishSequenceManager +from .enums import PNStatusCategory, PNHeartbeatNotificationOptions, PNOperationType, PNReconnectionPolicy +from .managers import SubscriptionManager, PublishSequenceManager, ReconnectionManager +from .models.consumer.common import PNStatus from .pnconfiguration import PNConfiguration from .pubnub_core import PubNubCore from .structures import PlatformOptions @@ -80,6 +81,53 @@ def request_future(self, *args, **kwargs): raise NotImplementedError +class NativeReconnectionManager(ReconnectionManager): + def __init__(self, pubnub): + super(NativeReconnectionManager, self).__init__(pubnub) + + def _register_heartbeat_timer(self): + self.stop_heartbeat_timer() + + self._recalculate_interval() + + self._timer = threading.Timer(self._timer_interval, self._call_time) + self._timer.start() + + def _call_time(self): + self._pubnub.time().async(self._call_time_callback) + + def _call_time_callback(self, resp, status): + print(resp) + + if not status.is_error(): + self._connection_errors = 1 + self.stop_heartbeat_timer() + self._callback.on_reconnect() + logger.debug("reconnection manager stop due success time endpoint call: %s" % utils.datetime_now()) + elif self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: + logger.debug("reconnect interval increment at: %s" % utils.datetime_now()) + self.stop_heartbeat_timer() + self._connection_errors += 1 + self._register_heartbeat_timer() + elif self._pubnub.config.reconnect_policy == PNReconnectionPolicy.LINEAR: + self.stop_heartbeat_timer() + self._connection_errors += 1 + self._register_heartbeat_timer() + + def start_polling(self): + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.NONE: + logger.warn("reconnection policy is disabled, please handle reconnection manually.") + return + + logger.debug("reconnection manager start at: %s" % utils.datetime_now()) + + self._register_heartbeat_timer() + + def stop_heartbeat_timer(self): + if self._timer is not None: + self._timer.cancel() + + class NativePublishSequenceManager(PublishSequenceManager): def __init__(self, provided_max_sequence): super(NativePublishSequenceManager, self).__init__(provided_max_sequence) @@ -97,13 +145,31 @@ def get_next_sequence(self): class NativeSubscriptionManager(SubscriptionManager): def __init__(self, pubnub_instance): + subscription_manager = self + self._message_queue = Queue() self._consumer_event = threading.Event() self._subscribe_call = None self._heartbeat_periodic_callback = None + self._reconnection_manager = NativeReconnectionManager(pubnub_instance) + super(NativeSubscriptionManager, self).__init__(pubnub_instance) self._start_worker() + class NativeReconnectionCallback(ReconnectionCallback): + def on_reconnect(self): + subscription_manager.reconnect() + + pn_status = PNStatus() + pn_status.category = PNStatusCategory.PNReconnectedCategory + pn_status.error = False + + subscription_manager._subscription_status_announced = True + subscription_manager._listener_manager.announce_status(pn_status) + + self._reconnection_listener = NativeReconnectionCallback() + self._reconnection_manager.set_reconnection_listener(self._reconnection_listener) + def _send_leave(self, unsubscribe_operation): def leave_callback(result, status): self._listener_manager.announce_status(status) @@ -153,7 +219,7 @@ def heartbeat_callback(raw_result, status): .state(state_payload) .async(heartbeat_callback)) except Exception as e: - print("failed", e) + logger.error("Heartbeat request failed: %s" % e) def _stop_heartbeat_timer(self): if self._heartbeat_periodic_callback is not None: @@ -171,6 +237,11 @@ def reconnect(self): self._start_subscribe_loop() self._register_heartbeat_timer() + def disconnect(self): + self._should_stop = True + self._stop_heartbeat_timer() + self._stop_subscribe_loop() + def _start_worker(self): consumer = NativeSubscribeMessageWorker(self._pubnub, self._listener_manager, self._message_queue, self._consumer_event) @@ -190,15 +261,25 @@ def _start_subscribe_loop(self): def callback(raw_result, status): """ SubscribeEndpoint callback""" if status.is_error(): + if status is not None and status.category == PNStatusCategory.PNCancelledCategory: + return + if status.category is PNStatusCategory.PNTimeoutCategory and not self._should_stop: self._start_subscribe_loop() - else: - self._listener_manager.announce_status(status) + return + + logger.error("Exception in subscribe loop: %s" % str(status.error_data.exception)) - return + if status is not None and status.category == PNStatusCategory.PNAccessDeniedCategory: + status.operation = PNOperationType.PNUnsubscribeOperation - self._handle_endpoint_call(raw_result, status) - self._start_subscribe_loop() + self._listener_manager.announce_status(status) + + self._reconnection_manager.start_polling() + self.disconnect() + else: + self._handle_endpoint_call(raw_result, status) + self._start_subscribe_loop() try: self._subscribe_call = Subscribe(self._pubnub) \ @@ -207,7 +288,7 @@ def callback(raw_result, status): .filter_expression(self._pubnub.config.filter_expression) \ .async(callback) except Exception as e: - print("failed", e) + logger.error("Subscribe request failed: %s" % e) def _stop_subscribe_loop(self): sc = self._subscribe_call diff --git a/pubnub/pubnub_asyncio.py b/pubnub/pubnub_asyncio.py index d99a5963..980294d8 100644 --- a/pubnub/pubnub_asyncio.py +++ b/pubnub/pubnub_asyncio.py @@ -248,17 +248,7 @@ def __init__(self, pubnub): @asyncio.coroutine def _register_heartbeat_timer(self): while True: - if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.EXPONENTIAL: - self._timer_interval = int(math.pow(2, self._connection_errors) - 1) - if self._timer_interval > self.MAXEXPONENTIALBACKOFF: - self._timer_interval = self.MINEXPONENTIALBACKOFF - self._connection_errors = 1 - logger.debug("timerInterval > MAXEXPONENTIALBACKOFF at: %s" % utils.datetime_now()) - elif self._timer_interval < 1: - self._timer_interval = self.MINEXPONENTIALBACKOFF - logger.debug("timerInterval = %d at: %s" % (self._timer_interval, utils.datetime_now())) - else: - self._timer_interval = self.INTERVAL + self._recalculate_interval() yield from asyncio.sleep(self._timer_interval) @@ -275,6 +265,10 @@ def _register_heartbeat_timer(self): self._connection_errors += 1 def start_polling(self): + if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.NONE: + logger.warn("reconnection policy is disabled, please handle reconnection manually.") + return + self._task = asyncio.ensure_future(self._register_heartbeat_timer()) def stop_polling(self): diff --git a/pubnub/pubnub_tornado.py b/pubnub/pubnub_tornado.py index e565ef92..a4c0a675 100644 --- a/pubnub/pubnub_tornado.py +++ b/pubnub/pubnub_tornado.py @@ -312,7 +312,6 @@ def _register_heartbeat_timer(self): self._connection_errors += 1 def start_polling(self): - # TODO: add the same to asyncio if self._pubnub.config.reconnect_policy == PNReconnectionPolicy.NONE: logger.warn("reconnection policy is disabled, please handle reconnection manually.") return diff --git a/tests/manual/asyncio/test_reconnections.py b/tests/manual/asyncio/test_reconnections.py index 5bc30969..a2ce4afe 100644 --- a/tests/manual/asyncio/test_reconnections.py +++ b/tests/manual/asyncio/test_reconnections.py @@ -57,7 +57,7 @@ async def countdown(): my_listener = MySubscribeCallback() pubnub.add_listener(my_listener) - pubnub.subscribe().channels('blah').execute() + pubnub.subscribe().channels('my_channel').execute() asyncio.ensure_future(close_soon()) asyncio.ensure_future(open_again()) diff --git a/tests/manual/native/__init__.py b/tests/manual/native/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/tests/manual/native/test_reconnection.py b/tests/manual/native/test_reconnection.py new file mode 100644 index 00000000..178215fd --- /dev/null +++ b/tests/manual/native/test_reconnection.py @@ -0,0 +1,49 @@ +# subscribe to pubnub channel, push messages into the queue, +# queue worker send send them to cli +import logging +import os +import sys + +d = os.path.dirname +PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) +sys.path.append(PUBNUB_ROOT) + +import pubnub as pn + +from pubnub.callbacks import SubscribeCallback +from pubnub.enums import PNReconnectionPolicy, PNStatusCategory +from pubnub.pnconfiguration import PNConfiguration +from pubnub.pubnub import PubNub + + +pn.set_stream_logger('pubnub', logging.DEBUG) +logger = logging.getLogger("myapp") + + +class MySubscribeCallback(SubscribeCallback): + def status(self, pubnub, status): + print("### status changed to: %s" % status.category) + if status.category == PNStatusCategory.PNReconnectedCategory: + pubnub.stop() + + def message(self, pubnub, message): + pass + + def presence(self, pubnub, presence): + pass + +pnconf = PNConfiguration() +pnconf.publish_key = "demo" +pnconf.subscribe_key = "demo" +pnconf.origin = "localhost:8089" +pnconf.subscribe_request_timeout = 10 +pnconf.reconnect_policy = PNReconnectionPolicy.LINEAR +pubnub = PubNub(pnconf) + +time_until_open_again = 8 + +my_listener = MySubscribeCallback() +pubnub.add_listener(my_listener) +pubnub.subscribe().channels('my_channel').execute() + +# atexit.register(pubnub.stop) diff --git a/tests/manual/tornado/subscribe_stub.py b/tests/manual/tornado/subscribe_stub.py index 1be9480a..901e87f0 100644 --- a/tests/manual/tornado/subscribe_stub.py +++ b/tests/manual/tornado/subscribe_stub.py @@ -30,6 +30,15 @@ def get(self): self.write('{"t":{"t":"%d","r":12},"m":[]}' % self.timestamp()) +class HeartbeatHandler(web.RequestHandler): + def timestamp(self): + return int(time.time() * 10000000) + + @gen.coroutine + def get(self): + self.write('{"status": 200, "message": "OK", "service": "Presence"}') + + class TimeHandler(web.RequestHandler): def timestamp(self): return int(time.time() * 10000000) @@ -42,7 +51,8 @@ def get(self): def main(): app = web.Application( [ - (r"/v2/subscribe/demo/demo/0", SubscribeHandler), + (r"/v2/subscribe/demo/my_channel/0", SubscribeHandler), + (r"/v2/presence/sub-key/demo/channel/my_channel/heartbeat", HeartbeatHandler), (r"/time/0", TimeHandler), ], cookie_secret="__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__", diff --git a/tests/manual/tornado/test_reconnections.py b/tests/manual/tornado/test_reconnections.py index 13699005..847b5379 100644 --- a/tests/manual/tornado/test_reconnections.py +++ b/tests/manual/tornado/test_reconnections.py @@ -68,6 +68,6 @@ def countdown(): my_listener = MySubscribeCallback() pubnub.add_listener(my_listener) - pubnub.subscribe().channels('demo').execute() + pubnub.subscribe().channels('my_channel').execute() yield gen.sleep(1000) From 48e2e86664aa52e036c87b5f80c58b586de32795 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 21 Dec 2016 07:07:49 -0800 Subject: [PATCH 435/468] Fix linting errors --- examples/native_threads/http/app.py | 1 - tests/manual/asyncio/test_reconnections.py | 19 +++++++++++-------- tests/manual/native/test_reconnection.py | 1 + 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/examples/native_threads/http/app.py b/examples/native_threads/http/app.py index 51956d9e..b8947495 100644 --- a/examples/native_threads/http/app.py +++ b/examples/native_threads/http/app.py @@ -4,7 +4,6 @@ import os import sys import atexit -import signal d = os.path.dirname PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) diff --git a/tests/manual/asyncio/test_reconnections.py b/tests/manual/asyncio/test_reconnections.py index a2ce4afe..6a8fa456 100644 --- a/tests/manual/asyncio/test_reconnections.py +++ b/tests/manual/asyncio/test_reconnections.py @@ -26,24 +26,27 @@ def presence(self, pubnub, presence): @pytest.mark.asyncio -async def test_blah(): +def test_blah(): pnconf = pnconf_sub_copy() assert isinstance(pnconf, PNConfiguration) pnconf.reconnect_policy = PNReconnectionPolicy.EXPONENTIAL pubnub = PubNubAsyncio(pnconf) time_until_open_again = 8 - async def close_soon(): - await asyncio.sleep(2) + @asyncio.coroutine + def close_soon(): + yield from asyncio.sleep(2) pubnub._connector.close() print(">>> connection is broken") - async def open_again(): - await asyncio.sleep(time_until_open_again) + @asyncio.coroutine + def open_again(): + yield from asyncio.sleep(time_until_open_again) pubnub.set_connector(aiohttp.TCPConnector(conn_timeout=pubnub.config.connect_timeout, verify_ssl=True)) print(">>> connection is open again") - async def countdown(): + @asyncio.coroutine + def countdown(): asyncio.sleep(2) opened = False count = time_until_open_again @@ -53,7 +56,7 @@ async def countdown(): count -= 1 if count <= 0: break - await asyncio.sleep(1) + yield from asyncio.sleep(1) my_listener = MySubscribeCallback() pubnub.add_listener(my_listener) @@ -63,4 +66,4 @@ async def countdown(): asyncio.ensure_future(open_again()) asyncio.ensure_future(countdown()) - await asyncio.sleep(1000) + yield from asyncio.sleep(1000) diff --git a/tests/manual/native/test_reconnection.py b/tests/manual/native/test_reconnection.py index 178215fd..ff4e3017 100644 --- a/tests/manual/native/test_reconnection.py +++ b/tests/manual/native/test_reconnection.py @@ -32,6 +32,7 @@ def message(self, pubnub, message): def presence(self, pubnub, presence): pass + pnconf = PNConfiguration() pnconf.publish_key = "demo" pnconf.subscribe_key = "demo" From 958830e63762db60f9e579a354802315639f0254 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 21 Dec 2016 07:20:29 -0800 Subject: [PATCH 436/468] Migrate from pubsub.punub.com to ps.pndsn.com --- pubnub/pnconfiguration.py | 2 +- pubnub/request_handlers/requests_handler.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index f0d661c2..0ceb4ba9 100644 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -9,7 +9,7 @@ class PNConfiguration(object): def __init__(self): # TODO: add validation self.uuid = None - self.origin = "pubsub.pubnub.com" + self.origin = "ps.pndsn.com" self.ssl = False self.non_subscribe_request_timeout = 10 self.subscribe_request_timeout = 310 diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index fef86e00..1e1ca12d 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -25,8 +25,8 @@ class RequestsRequestHandler(BaseRequestHandler): def __init__(self, pubnub): self.session = Session() - self.session.mount('http://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) - self.session.mount('https://pubsub.pubnub.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('http://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('https://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) self.pubnub = pubnub From 51c1a1e1888fb97669e87c826a18f30224378a33 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 21 Dec 2016 07:21:19 -0800 Subject: [PATCH 437/468] Update fixtures --- .../groups/add_channel_remove_group.yaml | 16 ++++---- .../groups/add_remove_multiple_channels.yaml | 16 ++++---- .../groups/add_remove_single_channel.yaml | 20 +++++----- .../fixtures/asyncio/here_now/global.yaml | 12 +++--- .../asyncio/here_now/multiple_channels.yaml | 12 +++--- .../asyncio/here_now/single_channel.yaml | 12 +++--- .../asyncio/invocations/envelope.yaml | 4 +- .../asyncio/invocations/envelope_raises.yaml | 4 +- .../fixtures/asyncio/invocations/future.yaml | 4 +- .../future_raises_pubnub_error.yaml | 4 +- .../fixtures/asyncio/pam/global_level.yaml | 12 +++--- .../asyncio/pam/multiple_channel_groups.yaml | 8 ++-- .../multiple_channel_groups_with_auth.yaml | 8 ++-- .../asyncio/pam/multiple_channels.yaml | 8 ++-- .../pam/multiple_channels_with_auth.yaml | 8 ++-- .../fixtures/asyncio/pam/single_channel.yaml | 8 ++-- .../asyncio/pam/single_channel_group.yaml | 8 ++-- .../pam/single_channel_group_with_auth.yaml | 8 ++-- .../asyncio/pam/single_channel_with_auth.yaml | 8 ++-- .../asyncio/publish/do_not_store.yaml | 4 +- .../fixtures/asyncio/publish/invalid_key.yaml | 4 +- .../fixtures/asyncio/publish/meta_object.yaml | 4 +- .../asyncio/publish/mixed_via_get.yaml | 16 ++++---- .../publish/mixed_via_get_encrypted.yaml | 16 ++++---- .../asyncio/publish/mixed_via_post.yaml | 16 ++++---- .../publish/mixed_via_post_encrypted.yaml | 16 ++++---- .../asyncio/publish/not_permitted.yaml | 4 +- .../asyncio/publish/object_via_get.yaml | 4 +- .../publish/object_via_get_encrypted.yaml | 4 +- .../asyncio/publish/object_via_post.yaml | 4 +- .../publish/object_via_post_encrypted.yaml | 4 +- .../fixtures/asyncio/secure/ssl.yaml | 4 +- .../asyncio/state/multiple_channel.yaml | 8 ++-- .../asyncio/state/single_channel.yaml | 8 ++-- .../single_channel_with_subscription.yaml | 32 +++++++-------- .../asyncio/subscription/cg_join_leave.yaml | 36 ++++++++--------- .../subscription/cg_sub_pub_unsub.yaml | 24 +++++------ .../asyncio/subscription/cg_sub_unsub.yaml | 16 ++++---- .../asyncio/subscription/join_leave.yaml | 28 ++++++------- .../asyncio/subscription/sub_pub_unsub.yaml | 16 ++++---- .../subscription/sub_pub_unsub_enc.yaml | 16 ++++---- .../asyncio/subscription/sub_unsub.yaml | 8 ++-- .../asyncio/subscription/unsubscribe_all.yaml | 24 +++++------ .../fixtures/asyncio/time/get.yaml | 4 +- .../asyncio/where_now/multiple_channels.yaml | 12 +++--- .../asyncio/where_now/single_channel.yaml | 12 +++--- .../add_channel_remove_group.yaml | 10 ++--- .../add_remove_multiple_channels.yaml | 10 ++--- .../channel_groups/single_channel.yaml | 10 ++--- .../fixtures/native_sync/history/basic.yaml | 12 +++--- .../fixtures/native_sync/history/encoded.yaml | 12 +++--- .../native_sync/history/not_permitted.yaml | 2 +- .../native_sync/publish/invalid_key.yaml | 2 +- .../native_sync/publish/publish_bool_get.yaml | 2 +- .../publish/publish_bool_post.yaml | 2 +- .../publish/publish_do_not_store.yaml | 2 +- .../publish/publish_encrypted_list_get.yaml | 2 +- .../publish/publish_encrypted_list_post.yaml | 2 +- .../publish/publish_encrypted_string_get.yaml | 2 +- .../publish_encrypted_string_post.yaml | 2 +- .../native_sync/publish/publish_int_get.yaml | 2 +- .../native_sync/publish/publish_int_post.yaml | 2 +- .../native_sync/publish/publish_list_get.yaml | 2 +- .../publish/publish_list_post.yaml | 2 +- .../publish/publish_object_get.yaml | 2 +- .../publish/publish_object_post.yaml | 2 +- .../publish/publish_string_get.yaml | 2 +- .../publish/publish_string_post.yaml | 2 +- .../publish/publish_with_meta.yaml | 2 +- .../fixtures/native_sync/ssl/ssl.yaml | 2 +- .../state/state_of_multiple_channels.yaml | 4 +- .../state/state_of_single_channel.yaml | 4 +- .../add_channel_remove_group.yaml | 8 ++-- .../add_remove_multiple_channels.yaml | 8 ++-- .../channel_groups/single_channel.yaml | 8 ++-- .../state/state_of_multiple_channels.yaml | 4 +- .../state/state_of_single_channel.yaml | 4 +- .../groups/add_channel_remove_group.yaml | 16 ++++---- .../groups/add_remove_multiple_channel.yaml | 16 ++++---- .../groups/add_remove_single_channel.yaml | 16 ++++---- .../fixtures/tornado/heartbeat/timeout.yaml | 40 +++++++++---------- .../fixtures/tornado/here_now/global.yaml | 20 +++++----- .../fixtures/tornado/here_now/multiple.yaml | 16 ++++---- .../fixtures/tornado/here_now/single.yaml | 12 +++--- .../tornado/invocations/future_raises.yaml | 4 +- .../tornado/invocations/result_raises.yaml | 4 +- .../tornado/publish/do_not_store.yaml | 8 ++-- .../fixtures/tornado/publish/invalid_key.yaml | 8 ++-- .../fixtures/tornado/publish/meta_object.yaml | 8 ++-- .../tornado/publish/mixed_via_get.yaml | 32 +++++++-------- .../publish/mixed_via_get_encrypted.yaml | 32 +++++++-------- .../tornado/publish/mixed_via_post.yaml | 32 +++++++-------- .../publish/mixed_via_post_encrypted.yaml | 32 +++++++-------- .../tornado/publish/not_permitted.yaml | 8 ++-- .../tornado/publish/object_via_get.yaml | 8 ++-- .../publish/object_via_get_encrypted.yaml | 8 ++-- .../tornado/publish/object_via_post.yaml | 8 ++-- .../publish/object_via_post_encrypted.yaml | 8 ++-- .../tornado/state/multiple_channel.yaml | 8 ++-- .../tornado/state/single_channel.yaml | 8 ++-- .../tornado/subscribe/group_join_leave.yaml | 40 +++++++++---------- .../subscribe/group_sub_pub_unsub.yaml | 24 +++++------ .../tornado/subscribe/group_sub_unsub.yaml | 16 ++++---- .../tornado/subscribe/join_leave.yaml | 32 +++++++-------- .../tornado/subscribe/sub_pub_unsub.yaml | 16 ++++---- .../fixtures/tornado/subscribe/sub_unsub.yaml | 8 ++-- .../subscribe/subscribe_tep_by_step.yaml | 16 ++++---- .../tornado/where_now/multiple_channels.yaml | 20 +++++----- .../tornado/where_now/single_channel.yaml | 12 +++--- .../fixtures/twisted/groups/add_channels.yaml | 4 +- .../twisted/groups/add_single_channel.yaml | 4 +- .../twisted/groups/list_channels.yaml | 4 +- .../twisted/groups/remove_channels.yaml | 4 +- .../twisted/groups/remove_single_channel.yaml | 4 +- .../fixtures/twisted/here_now/global.yaml | 4 +- .../fixtures/twisted/here_now/multiple.yaml | 4 +- .../fixtures/twisted/here_now/single.yaml | 4 +- .../twisted/publish/do_not_store.yaml | 4 +- .../fixtures/twisted/publish/forbidden.yaml | 4 +- .../fixtures/twisted/publish/invalid_key.yaml | 4 +- .../fixtures/twisted/publish/meta_object.yaml | 4 +- .../publish/mixed_encrypted_via_get.yaml | 16 ++++---- .../twisted/publish/mixed_via_get.yaml | 16 ++++---- .../twisted/publish/object_via_get.yaml | 4 +- .../twisted/state/multiple_channels.yaml | 4 +- .../twisted/state/single_channel.yaml | 4 +- .../fixtures/twisted/where_now/multiple.yaml | 4 +- .../fixtures/twisted/where_now/single.yaml | 4 +- 128 files changed, 646 insertions(+), 646 deletions(-) diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index bb54ca19..f36792d0 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:31 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:32 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:32 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:33 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 7c2508f6..93564fb3 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:28 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -29,13 +29,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:29 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -44,13 +44,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:30 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:31 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index 786398e4..08fff2c9 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1 response: body: {string: '[1,"Sent","14818962866394550"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:26 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -26,13 +26,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:26 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg response: body: {string: '{"status": 200, "payload": {"channels": ["test-channel-groups-asyncio-ch"], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", @@ -42,13 +42,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:27 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -57,13 +57,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:27 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "test-channel-groups-asyncio-cg"}, "service": "channel-registry", "error": false}'} @@ -72,5 +72,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:28 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid2 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index 2fc12228..bacebc57 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"t":{"t":"14818966149684039","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:55 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-subscribe-asyncio-join-leave-ch": {"uuids": ["test-subscribe-asyncio-listener"], "occupancy": 1}, "test-subscribe-asyncio-unsubscribe-all-ch1": @@ -33,13 +33,13 @@ interactions: CONTENT-LENGTH: '836', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:57:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -48,5 +48,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:57:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 8b794206..337b216a 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"t":{"t":"14818966089178163","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:49 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": {"uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}, "test-here-now-asyncio-ch1": @@ -28,13 +28,13 @@ interactions: CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -43,5 +43,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index b9b3f3b0..e0714cfc 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?tt=0 response: body: {string: '{"t":{"t":"14818966032335729","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:43 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml index 4b45d796..548ce8db 100644 --- a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 response: body: {string: '[1,"Sent","14818963274425606"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:07 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml index cfc27efa..36c79e22 100644 --- a/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22 + uri: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22 response: body: {string: '{"message":"Invalid Subscribe Key","error":true,"service":"Access Manager","status":400} @@ -16,5 +16,5 @@ interactions: CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:10 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} status: {code: 400, message: Bad Request} - url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 + url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future.yaml b/tests/integrational/fixtures/asyncio/invocations/future.yaml index a63a360d..82ddaa32 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 response: body: {string: '[1,"Sent","14818963241977190"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:04 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml index a70204f4..3c848587 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22 + uri: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22 response: body: {string: '{"message":"Invalid Subscribe Key","error":true,"service":"Access Manager","status":400} @@ -16,5 +16,5 @@ interactions: CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:07 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} status: {code: 400, message: Bad Request} - url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 + url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index 9fd1545d..73d82dd7 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?r=1&uuid=my_uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"r":1,"w":1,"m":0},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:10 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=HoR4kd5kOwKqZ3RHzjVP5HdgmoWAP-L0OzGlf3pLlXA=×tamp=1481896330&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=HoR4kd5kOwKqZ3RHzjVP5HdgmoWAP-L0OzGlf3pLlXA=×tamp=1481896330&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?uuid=my_uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","r":1,"m":0,"w":1,"ttl":1440,"channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"history_channel":{"auths":{"blah":{"r":1,"m":0,"w":1}}}},"objects":{},"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":166,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} @@ -30,13 +30,13 @@ interactions: CONTENT-LENGTH: '982', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=3DcPzxyRzAGRUteyDwv7b7ro_GHlabAUzPtSkTtfUSU=×tamp=1481896330&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=3DcPzxyRzAGRUteyDwv7b7ro_GHlabAUzPtSkTtfUSU=×tamp=1481896330&uuid=my_uuid - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&r=0&uuid=my_uuid&w=0 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&r=0&uuid=my_uuid&w=0 response: body: {string: '{"message":"Success","payload":{"level":"subkey","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1,"r":0,"w":0,"m":0},"service":"Access Manager","status":200}'} @@ -46,5 +46,5 @@ interactions: CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&signature=0sKgzEts2pTJr7twR9Bh9wrfV46VON0yxg9E7tpgRjU=×tamp=1481896331&uuid=my_uuid&w=0 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&signature=0sKgzEts2pTJr7twR9Bh9wrfV46VON0yxg9E7tpgRjU=×tamp=1481896331&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index 1e8503a3..a7ba3659 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"r":1,"w":1,"m":0},"test-pam-asyncio-cg2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VtYBdq4jE9aGehb765EPddcQhQbPxZ0Aqp6YjeMtJpY=×tamp=1481896333&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VtYBdq4jE9aGehb765EPddcQhQbPxZ0Aqp6YjeMtJpY=×tamp=1481896333&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '413', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=fXT2f9pwZhWWbG-Gaaa0f3l21p5yee4QO-JqrCjBkSU=×tamp=1481896333&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=fXT2f9pwZhWWbG-Gaaa0f3l21p5yee4QO-JqrCjBkSU=×tamp=1481896333&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index 533b7682..968b9d64 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-cg2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:14 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Lokw1jIF_zlAlk8VKfDZGechmTe9u6HaeSnvtaaQtXM=×tamp=1481896333&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Lokw1jIF_zlAlk8VKfDZGechmTe9u6HaeSnvtaaQtXM=×tamp=1481896333&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"test-pam-asyncio-cg2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:14 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=ZgUT1TBwYYEChvdtr2xQS3Ln7YZD2b6R8ktUW44zbkY=×tamp=1481896334&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=ZgUT1TBwYYEChvdtr2xQS3Ln7YZD2b6R8ktUW44zbkY=×tamp=1481896334&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index f147b22d..91c39284 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"r":1,"w":1,"m":0},"test-pam-asyncio-ch2":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=fBB-FwdPoO45PXR9NvaTIhGagcvDHpNsMFLDwI16k0U=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=fBB-FwdPoO45PXR9NvaTIhGagcvDHpNsMFLDwI16k0U=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=test-pam-asyncio-uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '401', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=eu_KBB6V9wcllZrZ__wfKB5r8MDD6bk2PJFuHu6rYFo=×tamp=1481896332&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=eu_KBB6V9wcllZrZ__wfKB5r8MDD6bk2PJFuHu6rYFo=×tamp=1481896332&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index 4efe7ae1..da6413f6 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=my_uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch1":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"test-pam-asyncio-ch2":{"auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=8liy0K_7A7VC6EcZ_lZk7pdQRlQaracysvEprI2OwnY=×tamp=1481896332&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=8liy0K_7A7VC6EcZ_lZk7pdQRlQaracysvEprI2OwnY=×tamp=1481896332&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=my_uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch2":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}},"test-pam-asyncio-ch1":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '401', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=dbZkXTLoS2rBDyxhUnYv-kCbuYxyxmRzpq_Brl3xKK4=×tamp=1481896332&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=dbZkXTLoS2rBDyxhUnYv-kCbuYxyxmRzpq_Brl3xKK4=×tamp=1481896332&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index 259b3099..342ca27f 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&r=1&uuid=my_uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&r=1&uuid=my_uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channels":{"test-pam-asyncio-ch":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VbXpLZNb0qIVR7W5vNsq9xzO8Pbl-TVq2emBPu6TkVg=×tamp=1481896331&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VbXpLZNb0qIVR7W5vNsq9xzO8Pbl-TVq2emBPu6TkVg=×tamp=1481896331&uuid=my_uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&uuid=my_uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&uuid=my_uuid response: body: {string: '{"message":"Success","payload":{"level":"channel","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channels":{"test-pam-asyncio-ch":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '282', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=D_DmhzxnuCBeA15JtmXgjTTMvbXg_5ZZ-azpArQSAQc=×tamp=1481896331&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=D_DmhzxnuCBeA15JtmXgjTTMvbXg_5ZZ-azpArQSAQc=×tamp=1481896331&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index 70a27865..34300745 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":{"test-pam-asyncio-cg":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=BmTSr5gdDP3UkBWaSLt4mBEC9rFFZjNJRR9g_tCxLEQ=×tamp=1481896332&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=BmTSr5gdDP3UkBWaSLt4mBEC9rFFZjNJRR9g_tCxLEQ=×tamp=1481896332&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-groups":{"test-pam-asyncio-cg":{"r":1,"m":0,"w":1,"ttl":1440,"auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":166}}}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '294', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=S5p2eOGJ6fXtWge3VGpdwzti7pVNAbUZ05Wb3famUig=×tamp=1481896332&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=S5p2eOGJ6fXtWge3VGpdwzti7pVNAbUZ05Wb3famUig=×tamp=1481896332&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index 407bf937..d94d3724 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel-groups":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=5TUABkdYUy7WHzCCKrU9H3vPuPZ2gHZAeaDcl7eMA54=×tamp=1481896333&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=5TUABkdYUy7WHzCCKrU9H3vPuPZ2gHZAeaDcl7eMA54=×tamp=1481896333&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"channel-group+auth","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel-group":"test-pam-asyncio-cg","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PlsjUwIg9fE8aGoFJ8exIdRAdX9w58jiU5LiEchEV4U=×tamp=1481896333&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PlsjUwIg9fE8aGoFJ8exIdRAdX9w58jiU5LiEchEV4U=×tamp=1481896333&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index 9d4f7bf0..966b5e22 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&r=1&uuid=test-pam-asyncio-uuid&w=1 + uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&r=1&uuid=test-pam-asyncio-uuid&w=1 response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","ttl":1440,"channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"w":1,"m":0}}},"service":"Access Manager","status":200}'} @@ -14,13 +14,13 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=F4zNd7p_UsQrl_v2vzhJz-ONitOhGhNENOkpddiaxPw=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=F4zNd7p_UsQrl_v2vzhJz-ONitOhGhNENOkpddiaxPw=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&uuid=test-pam-asyncio-uuid + uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&uuid=test-pam-asyncio-uuid response: body: {string: '{"message":"Success","payload":{"level":"user","subscribe_key":"sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f","channel":"test-pam-asyncio-ch","auths":{"test-pam-asyncio-auth":{"r":1,"m":0,"w":1,"ttl":1440}}},"service":"Access Manager","status":200}'} @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=zuuexSpQPVHApIDglAa2RRJFUycU2nvya_GshRBd8V0=×tamp=1481896331&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=zuuexSpQPVHApIDglAa2RRJFUycU2nvya_GshRBd8V0=×tamp=1481896331&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index 0d229f74..ef5e1f66 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?store=0 response: body: {string: '[1,"Sent","14820978549499111"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&store=0&uuid=dc05f6a6-e648-4cf1-bbfa-b212ef5945e6&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&store=0&uuid=dc05f6a6-e648-4cf1-bbfa-b212ef5945e6&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index 8f3988d9..200e4e06 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22 + uri: http://ps.pndsn.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22 response: body: {string: '[0,"Invalid Key","14820978550352022"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:55 GMT'} status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=67af3c55-453e-45f7-bdbd-294d5499cd88&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=67af3c55-453e-45f7-bdbd-294d5499cd88&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index 6a5a6376..77e6fe4a 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D response: body: {string: '[1,"Sent","14820978548732558"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=5cf73370-124e-4bc0-8d93-ce450d3dbfe3&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=5cf73370-124e-4bc0-8d93-ce450d3dbfe3&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index ae572e6e..9d26238e 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D response: body: {string: '[1,"Sent","14820978538596935"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=4&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=4&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22 response: body: {string: '[1,"Sent","14820978538628289"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?seqn=1&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?seqn=1&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true response: body: {string: '[1,"Sent","14820978538632877"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?seqn=3&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?seqn=3&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5 response: body: {string: '[1,"Sent","14820978541276088"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?seqn=2&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?seqn=2&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index 69e63bcb..fb7c3ead 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22 response: body: {string: '[1,"Sent","14820978544948351"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22 response: body: {string: '[1,"Sent","14820978544961915"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=4&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=4&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22 response: body: {string: '[1,"Sent","14820978545058783"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22 response: body: {string: '[1,"Sent","14820978545186148"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=3&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=3&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index 21701de5..b267bdf2 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978543080292"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"hi"' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978543212753"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '["hi", "hi2", "hi3"]' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978543265053"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '5' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978543321181"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index 44a5314c..d2bf5d0f 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -4,51 +4,51 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978546823218"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978546834160"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978546866887"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978546879220"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index dd5ca8b7..80bb160f 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22 response: body: {string: '{"message":"Forbidden","payload":{"channels":["asyncio-int-publish"]},"error":true,"service":"Access Manager","status":403} @@ -16,5 +16,5 @@ interactions: CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Sun, 18 Dec 2016 21:50:55 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=48600fc7-b3ea-487e-abdc-622c3feec615&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=48600fc7-b3ea-487e-abdc-622c3feec615&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index d7cfb0d0..c3f5494d 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D response: body: {string: '[1,"Sent","14820978542248113"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=be0961fa-1d5e-43ec-83f4-39c8cd91f046&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=be0961fa-1d5e-43ec-83f4-39c8cd91f046&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index 74fc208f..fb974db3 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22 response: body: {string: '[1,"Sent","14820978545989239"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=3487ec85-56c6-4696-b781-3c6f958da670&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=3487ec85-56c6-4696-b781-3c6f958da670&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index 283d22c7..db97b870 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978544115848"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=73b4e16c-38ee-4d54-99f3-2dd4b7f85169&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=73b4e16c-38ee-4d54-99f3-2dd4b7f85169&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index d9f46171..aa20feab 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: body: {string: '[1,"Sent","14820978547800881"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=174a9cbe-2737-4184-9888-c4cfe6767ed5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=174a9cbe-2737-4184-9888-c4cfe6767ed5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index 8e89cf8d..ff4ff960 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1 + uri: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1 response: body: {string: '[1,"Sent","14818963356429731"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:15 GMT'} status: {code: 200, message: OK} - url: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=784bc904-18af-4e75-981e-bd8e6bfbeb61&seqn=1 + url: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=784bc904-18af-4e75-981e-bd8e6bfbeb61&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index 389c429a..112b5b3f 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -13,13 +13,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:29 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-state-asyncio-ch1": {"count": 5, "name": "Alex"}, "test-state-asyncio-ch2": {"count": 5, "name": @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:29 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index 9cca12c6..2f4d591f 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -13,13 +13,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 25a45ca5..0a1919f7 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0 response: body: {string: '{"t":{"t":"14820964868757435","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -25,13 +25,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -39,13 +39,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -53,13 +53,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -82,13 +82,13 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:27 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: body: {string: '{"status": 200, "uuid": "test-state-asyncio-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": @@ -98,13 +98,13 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:27 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -113,5 +113,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:28 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index 7b43a307..54544c9b 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tt=0&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tt=0&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963663448174","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:46 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963663448174&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963663448174&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963671558888","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963670791786","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1481896367, "uuid": "test-subscribe-asyncio-listener", @@ -41,26 +41,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963663448174&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963663448174&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group&tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14818963670970002","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:47 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963671558888&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963671558888&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963680969905","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963680505104","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "join", "timestamp": 1481896368, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963671558888&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963671558888&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963680969905&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963680969905&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963683554558","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963682712656","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-cg-channel-pnpres","d":{"action": "leave", "timestamp": 1481896368, "uuid": "test-subscribe-asyncio-messenger", @@ -84,13 +84,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963680969905&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963680969905&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -99,13 +99,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-listener response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -114,13 +114,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -129,5 +129,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 0c8a7820..6d20b652 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,52 +13,52 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 response: body: {string: '{"t":{"t":"14818963649240210","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?seqn=1 response: body: {string: '[1,"Sent","14818963650918583"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tr=12&tt=14818963649240210 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tr=12&tt=14818963649240210 response: body: {string: '{"t":{"t":"14818963650918833","r":12},"m":[{"a":"2","f":0,"i":"816d9356-41d0-4b1d-ba5c-b3488822ab64","s":1,"p":{"t":"14818963650918583","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-channel","d":"hey","b":"test-subscribe-asyncio-group"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963649240210&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&tr=12&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963649240210&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&tr=12&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -67,13 +67,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -82,5 +82,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 84062575..1ea27d8a 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,26 +13,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:40 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 response: body: {string: '{"t":{"t":"14818963632209414","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,13 +41,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -56,5 +56,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index e1e79bc8..0a3b9f3b 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tt=0&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tt=0&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963579052943","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963579052943&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963579052943&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963588185526","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963587725382","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1481896358, "uuid": "test-subscribe-asyncio-listener", @@ -26,26 +26,26 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963579052943 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963579052943 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14818963587880346","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963588185526&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963588185526&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963592503447","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963592048448","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "join", "timestamp": 1481896359, "uuid": "test-subscribe-asyncio-messenger", @@ -54,13 +54,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963588185526 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963588185526 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963592503447&uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963592503447&uuid=test-subscribe-asyncio-listener response: body: {string: '{"t":{"t":"14818963595693130","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818963594851376","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-join-leave-ch-pnpres","d":{"action": "leave", "timestamp": 1481896359, "uuid": "test-subscribe-asyncio-messenger", @@ -69,13 +69,13 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '354', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963592503447 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963592503447 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -84,13 +84,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -99,5 +99,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:40 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 68239177..9d06a295 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -4,46 +4,46 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid-sub + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"t":{"t":"14818963571353315","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-subscribe-asyncio-uuid-pub + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-subscribe-asyncio-uuid-pub response: body: {string: '[1,"Sent","14818963573025400"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-pub&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-pub&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963571353315&uuid=test-subscribe-asyncio-uuid-sub + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963571353315&uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"t":{"t":"14818963573055360","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid-pub","s":1,"p":{"t":"14818963573025400","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"hey"}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tr=12&tt=14818963571353315 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tr=12&tt=14818963571353315 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid-sub + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid-sub response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index 91250fb7..63597adf 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -4,46 +4,46 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid response: body: {string: '{"t":{"t":"14818963573055360","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&uuid=test-subscribe-asyncio-uuid + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&uuid=test-subscribe-asyncio-uuid response: body: {string: '[1,"Sent","14818963577217258"]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&seqn=1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963573055360&uuid=test-subscribe-asyncio-uuid + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963573055360&uuid=test-subscribe-asyncio-uuid response: body: {string: '{"t":{"t":"14818963577286072","r":12},"m":[{"a":"2","f":0,"i":"test-subscribe-asyncio-uuid","s":1,"p":{"t":"14818963577217258","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"test-subscribe-asyncio-ch","d":"D7oVjBCciNszAo/EROu5Jw=="}]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '249', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tr=12&tt=14818963573055360 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tr=12&tt=14818963573055360 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index 2af77f64..e2994f0e 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0 response: body: {string: '{"t":{"t":"14818963568306880","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:36 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -26,5 +26,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index bd4a0977..b1174f68 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -4,7 +4,7 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -13,13 +13,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -28,26 +28,26 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&tt=0&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&tt=0&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"t":{"t":"14818963699240141","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -56,13 +56,13 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -71,13 +71,13 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -86,5 +86,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index c9d18650..1a51d33a 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -4,12 +4,12 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/time/0 + uri: http://ps.pndsn.com/time/0 response: body: {string: '[14818963707386265]'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid + url: http://ps.pndsn.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index 6f032f45..319e11e5 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?tt=0&uuid=test-where-now-asyncio-uuid + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?tt=0&uuid=test-where-now-asyncio-uuid response: body: {string: '{"t":{"t":"14818963736399219","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch1", "test-where-now-asyncio-ch2"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:53:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:53:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index bd9ef743..babc386a 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -4,20 +4,20 @@ interactions: headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?tt=0 response: body: {string: '{"t":{"t":"14818963708992326","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:51 GMT'} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["test-where-now-asyncio-ch"]}, "service": "Presence"}'} @@ -26,13 +26,13 @@ interactions: CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid - request: body: null headers: USER-AGENT: [PubNub-Python-Asyncio/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index 8ad581a5..2f6c1990 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -55,7 +55,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -104,7 +104,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index 510b3f6f..0442d15e 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -55,7 +55,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -104,7 +104,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index e5b44fae..0e23369b 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg/remove + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -55,7 +55,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-native-ch"], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?remove=channel-groups-native-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?remove=channel-groups-native-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -104,7 +104,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-native-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 69b50134..56e7ac17 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?seqn=1 response: body: {string: '[1,"Sent","14820999261239656"]'} headers: @@ -27,7 +27,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?seqn=2 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?seqn=2 response: body: {string: '[1,"Sent","14820999261946479"]'} headers: @@ -47,7 +47,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?seqn=3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?seqn=3 response: body: {string: '[1,"Sent","14820999262698311"]'} headers: @@ -67,7 +67,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?seqn=4 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?seqn=4 response: body: {string: '[1,"Sent","14820999263462219"]'} headers: @@ -87,7 +87,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?seqn=5 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?seqn=5 response: body: {string: '[1,"Sent","14820999264622346"]'} headers: @@ -107,7 +107,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 + uri: http://ps.pndsn.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 response: body: {string: '[["hey-0","hey-1","hey-2","hey-3","hey-4"],14820999261239656,14820999264622346]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index 4634d73d..9e6b3deb 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?seqn=1 response: body: {string: '[1,"Sent","14820999316486003"]'} headers: @@ -27,7 +27,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?seqn=2 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?seqn=2 response: body: {string: '[1,"Sent","14820999317435640"]'} headers: @@ -47,7 +47,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?seqn=3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?seqn=3 response: body: {string: '[1,"Sent","14820999318312588"]'} headers: @@ -67,7 +67,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?seqn=4 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?seqn=4 response: body: {string: '[1,"Sent","14820999319032490"]'} headers: @@ -87,7 +87,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?seqn=5 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?seqn=5 response: body: {string: '[1,"Sent","14820999319748646"]'} headers: @@ -107,7 +107,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 + uri: http://ps.pndsn.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 response: body: {string: '[["QfD1NCBJCmt1aPPGU2cshw==","cIioHNL2bZY8a/Ma5fBsAA==","8YmOnXcBGHtlYIdpGkOvUA==","arJa5qQszd4hc65Y4Y2CxA==","OJvWYC/bWXFvcw/TNic9hQ=="],14820999316486003,14820999319748646]'} headers: diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index 66be23a3..02a08f73 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&signature=DFG6A6mYSj-s8dj3w_cQNBJdMCPCYeHLpiAgeIbCb-g%3D×tamp=1482099937 + uri: http://ps.pndsn.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&signature=DFG6A6mYSj-s8dj3w_cQNBJdMCPCYeHLpiAgeIbCb-g%3D×tamp=1482099937 response: body: {string: '[[],0,0]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index 9860f2e0..7cd0ab7d 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/ch1/0/%22hey%22?seqn=1 + uri: http://ps.pndsn.com/publish/fake/demo/0/ch1/0/%22hey%22?seqn=1 response: body: {string: '[0,"Invalid Key","14820999375199241"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index e77e0680..594b1858 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.3&seqn=1 response: body: {string: '[1,"Sent","14820999376228286"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index cd66c5f2..225aec45 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['4'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: body: {string: '[1,"Sent","14820999377437961"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index 90d357a0..230ec381 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&store=0 response: body: {string: '[1,"Sent","14820999378413753"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index e17858b6..efc88687 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?seqn=1 response: body: {string: '[1,"Sent","14820999379661923"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index 9c79a160..21948755 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['46'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: body: {string: '[1,"Sent","14820999380905641"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index f6ed86a7..368d51b8 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?seqn=1 response: body: {string: '[1,"Sent","14820999381884038"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index eb99f6dd..f7931400 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['46'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: body: {string: '[1,"Sent","14820999383119516"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index 29f14e71..8c8e792d 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?seqn=1 response: body: {string: '[1,"Sent","14820999384088589"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index 46933a2e..92b56894 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['1'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: body: {string: '[1,"Sent","14820999385319018"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index fe8da0fa..6b11da15 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1 response: body: {string: '[1,"Sent","14820999386271370"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index a2356260..eae0021a 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['20'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: body: {string: '[1,"Sent","14820999387500502"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index f8bf00fd..a147e9b2 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D response: body: {string: '[1,"Sent","14820999388469350"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 4f76664f..726b6103 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['32'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0 response: body: {string: '[1,"Sent","14820999389689577"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index e71277f1..0feeab5e 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 response: body: {string: '[1,"Sent","14820999390622229"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index d539887f..6aab51b6 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -8,7 +8,7 @@ interactions: Content-Length: ['4'] User-Agent: [PubNub-Python/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: body: {string: '[1,"Sent","14820999391849243"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index a4624527..757c1f86 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22b%22%3A+%22qwer%22%2C+%22a%22%3A+2%7D&seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22b%22%3A+%22qwer%22%2C+%22a%22%3A+2%7D&seqn=1 response: body: {string: '[1,"Sent","14820999392820954"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index 193ef6fa..c1bfaa71 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: https://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 + uri: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 response: body: {string: '[1,"Sent","14820999394535296"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index 786b9f89..57614f5c 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index 0042cbd2..05d2d40e 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index 9591ceb4..27c47725 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index d96a09aa..ee2b24f3 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch1", "channel-groups-unit-ch2"], "group": "channel-groups-unit-cg"}, "service": @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index 5596c9b8..f72d30ca 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-unit-ch"], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": @@ -56,7 +56,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -80,7 +80,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-unit-cg"}, "service": "channel-registry", "error": false}'} diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index 34c10f43..cf20137c 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-native-sync-ch-1": {"count": 5, "name": "Alex"}, "state-native-sync-ch-2": {"count": 5, "name": diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index 595c9603..ec774da7 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -7,7 +7,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -31,7 +31,7 @@ interactions: Connection: [keep-alive] User-Agent: [PubNub-Python/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid response: body: {string: '{"status": 200, "uuid": "state-native-sync-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-native-sync-ch"}'} diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml index 268360d9..3264cd61 100644 --- a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml index 35da7dae..2bc1be52 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['187'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml index 79b2f2ef..ab0d8375 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml index 433b6dea..bd802134 100644 --- a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341188112072 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341188112072 response: body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341195231188 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341195231188 response: body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -176,14 +176,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -218,14 +218,14 @@ interactions: - Age - ['3'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -260,14 +260,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341206425665 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341206425665 response: body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -295,14 +295,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341368999461 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341368999461 response: body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -330,14 +330,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -373,5 +373,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml index e073a67b..ec47ad64 100644 --- a/tests/integrational/fixtures/tornado/here_now/global.yaml +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -185,5 +185,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml index 27293933..5532794e 100644 --- a/tests/integrational/fixtures/tornado/here_now/multiple.yaml +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml index 5351f4bd..f5082afc 100644 --- a/tests/integrational/fixtures/tornado/here_now/single.yaml +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:34 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-uuid"], "occupancy": 1}'} @@ -74,14 +74,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:38 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:39 GMT'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/invocations/future_raises.yaml b/tests/integrational/fixtures/tornado/invocations/future_raises.yaml index dd14eef3..32c5823a 100644 --- a/tests/integrational/fixtures/tornado/invocations/future_raises.yaml +++ b/tests/integrational/fixtures/tornado/invocations/future_raises.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: !!python/unicode '{"message":"Invalid Subscribe Key","error":true,"service":"Access Manager","status":400} @@ -40,5 +40,5 @@ interactions: - Content-Type - [text/javascript; charset=UTF-8] status: {code: 400, message: Bad Request} - url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1&uuid=3293317b-a598-4a4e-b54a-3fac8ae3f8d5 + url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1&uuid=3293317b-a598-4a4e-b54a-3fac8ae3f8d5 version: 1 diff --git a/tests/integrational/fixtures/tornado/invocations/result_raises.yaml b/tests/integrational/fixtures/tornado/invocations/result_raises.yaml index 2d299a12..8baa2a13 100644 --- a/tests/integrational/fixtures/tornado/invocations/result_raises.yaml +++ b/tests/integrational/fixtures/tornado/invocations/result_raises.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.2] method: GET - uri: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 + uri: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2 response: body: {string: !!python/unicode '{"message":"Invalid Subscribe Key","error":true,"service":"Access Manager","status":400} @@ -40,5 +40,5 @@ interactions: - Content-Type - [text/javascript; charset=UTF-8] status: {code: 400, message: Bad Request} - url: http://pubsub.pubnub.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1&uuid=189c0a7b-13b1-4d4c-a257-14fc2a124aaa + url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.2&seqn=1&uuid=189c0a7b-13b1-4d4c-a257-14fc2a124aaa version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml index 2aae9d45..8c3cb3f9 100644 --- a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 response: body: {string: '[1,"Sent","14707213568554057"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 response: body: {string: '[1,"Sent","14707213569308777"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml index abbdc038..05895479 100644 --- a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[0,"Invalid Key","14707240653092162"]'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[0,"Invalid Key","14707240653816927"]'} headers: @@ -64,5 +64,5 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://pubsub.pubnub.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml index 485ad7da..8ac93fb9 100644 --- a/tests/integrational/fixtures/tornado/publish/meta_object.yaml +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14707233493629583"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14707233494525529"]'} headers: @@ -64,5 +64,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml index 7f8dbe53..ac5adfc7 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654961878754"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654962988338"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654963998910"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654965094211"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654966264107"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654968497326"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654969624146"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654971058947"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml index b7d9a024..c41328a1 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654973576283"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654974534808"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654975469383"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654976370725"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654977343057"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654978302189"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654979370691"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706654980293520"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml index cb506ceb..3c5f423a 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789261217101"]'} headers: @@ -31,14 +31,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"hi"' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789261901583"]'} headers: @@ -64,14 +64,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '5' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789262581697"]'} headers: @@ -97,14 +97,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '5' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789263258448"]'} headers: @@ -130,14 +130,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: 'true' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789263937508"]'} headers: @@ -163,14 +163,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: 'true' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789264623948"]'} headers: @@ -196,14 +196,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789265622885"]'} headers: @@ -229,14 +229,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706789266306131"]'} headers: @@ -262,5 +262,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml index dd2bf388..b6a4d046 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724320847330"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724321905127"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724322939251"]'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724323960752"]'} headers: @@ -130,14 +130,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724325062358"]'} headers: @@ -163,14 +163,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724326150829"]'} headers: @@ -196,14 +196,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724327259504"]'} headers: @@ -229,14 +229,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706724328343318"]'} headers: @@ -262,5 +262,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index 274dddec..13f68255 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -46,14 +46,14 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -94,5 +94,5 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml index fc0c4fde..b47a3882 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653397219269"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653398506519"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml index b10d5800..57d7a749 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653400646308"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706653401928744"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml index 35c912bf..277034c6 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706787329216107"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff - request: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706787330184998"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml index 820d842c..839eff02 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706781595277610"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1 - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: POST - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '[1,"Sent","14706781596540558"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=2 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=2 version: 1 diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml index 40df8f47..64ee8fce 100644 --- a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, @@ -85,5 +85,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml index 95f7c2fa..b7d9c1e5 100644 --- a/tests/integrational/fixtures/tornado/state/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} @@ -84,5 +84,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index 5da7b929..ab1ff2a2 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869649333428","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869649333428 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869649333428 response: body: {string: !!python/unicode '{"t":{"t":"14818869660519117","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869659745206","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1481886965, "uuid": "test-subscribe-listener", "occupancy": @@ -109,14 +109,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869649333428&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869649333428&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869660187938","r":12},"m":[]}'} headers: @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-messenger + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869660519117 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869660519117 response: body: {string: !!python/unicode '{"t":{"t":"14818869669268862","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869668806336","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "join", "timestamp": 1481886966, "uuid": "test-subscribe-messenger", "occupancy": @@ -177,14 +177,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869660519117&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869660519117&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -220,14 +220,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869669268862 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869669268862 response: body: {string: !!python/unicode '{"t":{"t":"14818869671710838","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869670946160","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1481886967, "uuid": "test-subscribe-messenger", "occupancy": @@ -255,14 +255,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869669268862&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869669268862&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869671710838 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869671710838 response: body: {string: !!python/unicode '{"t":{"t":"14818869675101369","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869674639626","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-test-channel-pnpres","d":{"action": "leave", "timestamp": 1481886967, "uuid": "test-subscribe-listener", "occupancy": @@ -290,14 +290,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869671710838&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869671710838&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -333,14 +333,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -376,5 +376,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger&remove=subscribe-test-channel + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger&remove=subscribe-test-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index d134f9b6..80e8ab74 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869687160475","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22 response: body: {string: !!python/unicode '[1,"Sent","14818869688799557"]'} headers: @@ -107,14 +107,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tr=12&tt=14818869687160475 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tr=12&tt=14818869687160475 response: body: {string: !!python/unicode '{"t":{"t":"14818869688928592","r":12},"m":[{"a":"2","f":0,"i":"eb63e8cb-b81c-4ccc-b411-bb53264e3c09","s":1,"p":{"t":"14818869688799557","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-unsubscribe-channel","d":"hey","b":"subscribe-unsubscribe-group"}]}'} headers: @@ -140,14 +140,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869687160475&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869687160475&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,14 +183,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -226,5 +226,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09&remove=subscribe-unsubscribe-channel + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09&remove=subscribe-unsubscribe-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index cbc6a2dc..49d7cbe8 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869688928592","r":12},"m":[]}'} headers: @@ -74,14 +74,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=709e16b4-d30b-4854-98c2-c4e965564abb + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,14 +117,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -160,5 +160,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb&remove=subscribe-unsubscribe-channel + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb&remove=subscribe-unsubscribe-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index 915358ba..4166280e 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869603870494","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869603870494 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869603870494 response: body: {string: !!python/unicode '{"t":{"t":"14818869613057835","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869612281954","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1481886961, "uuid": "subscribe-tornado-listener-3", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869603870494&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869603870494&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869612949707","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869613057835 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869613057835 response: body: {string: !!python/unicode '{"t":{"t":"14818869622225817","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869621699814","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1481886962, "uuid": "subscribe-tornado-messenger-3", @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869613057835&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869613057835&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869622225817 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869622225817 response: body: {string: !!python/unicode '{"t":{"t":"14818869626041325","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869625576502","r":2},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "leave", "timestamp": 1481886962, "uuid": "subscribe-tornado-messenger-3", @@ -169,14 +169,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869622225817&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869622225817&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -212,14 +212,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869626041325 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869626041325 response: body: {string: !!python/unicode '{"t":{"t":"14818869630029993","r":12},"m":[{"a":"2","f":0,"p":{"t":"14818869628593295","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1481886962, "uuid": "subscribe-tornado-listener-3", "occupancy": @@ -247,14 +247,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869626041325&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869626041325&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -290,5 +290,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index c31325a3..6bc1d69a 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869631121257","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22 response: body: {string: !!python/unicode '[1,"Sent","14818869633015166"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tr=12&tt=14818869631121257 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tr=12&tt=14818869631121257 response: body: {string: !!python/unicode '{"t":{"t":"14818869633017084","r":12},"m":[{"a":"2","f":0,"i":"18aa1154-a3bd-4e71-994d-8685b56eeecc","s":1,"p":{"t":"14818869633015166","r":12},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"subscribe-tornado-ch","d":"hey"}]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=14818869631121257&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=14818869631121257&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -140,5 +140,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index b7770105..692c1ff7 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869633017084","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index b09b2228..f2fea9c3 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869706095939","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tr=12&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tr=12&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14818869716760786","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml index 72c863ea..0425861e 100644 --- a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", "where-now-tornado-ch1"]}, "service": "Presence"}'} @@ -140,14 +140,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,5 +183,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml index f6f9364d..fecd256f 100644 --- a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 response: body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, "service": "Presence"}'} @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] User-Agent: [PubNub-Python-Tornado/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml index 43f76d01..7c86da7b 100644 --- a/tests/integrational/fixtures/twisted/groups/add_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml index 30721b7b..559cef81 100644 --- a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml index b929d8c4..7a8dd9b6 100644 --- a/tests/integrational/fixtures/twisted/groups/list_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml index 75657fad..ab404470 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc0%2Ccgttc1 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc0%2Ccgttc1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml index d62cae69..cb867253 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml index e57ebafc..21b88b0c 100644 --- a/tests/integrational/fixtures/twisted/here_now/global.yaml +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -14,5 +14,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml index f95ecdcc..e396280e 100644 --- a/tests/integrational/fixtures/twisted/here_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -13,5 +13,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml index ac7d0927..4858ee32 100644 --- a/tests/integrational/fixtures/twisted/here_now/single.yaml +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml index 3d6e4671..cd5f6b50 100644 --- a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -4,12 +4,12 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&store=0 response: body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index 5927e104..be3f37b9 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -14,5 +14,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 403, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml index 951dbec7..cdf88d22 100644 --- a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -4,12 +4,12 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 400, message: ''} - url: http://pubsub.pubnub.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 + url: http://ps.pndsn.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml index 53b4ca40..8ee7d5ac 100644 --- a/tests/integrational/fixtures/twisted/publish/meta_object.yaml +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -4,12 +4,12 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml index 2d976fff..9363f219 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -4,51 +4,51 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 - request: body: !!python/unicode headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 - request: body: !!python/unicode headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 - request: body: !!python/unicode headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml index 2db8d8bb..744cbd1a 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -4,51 +4,51 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 - request: body: !!python/unicode headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 - request: body: !!python/unicode headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 - request: body: !!python/unicode headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml index 9a18ad67..6aebc2fe 100644 --- a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -4,12 +4,12 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml index 190c9bb5..a72bb0f5 100644 --- a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml index 2879fe4c..95faa0b1 100644 --- a/tests/integrational/fixtures/twisted/state/single_channel.yaml +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml index 22b0cdc6..7c62c3ed 100644 --- a/tests/integrational/fixtures/twisted/where_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml index 62c9300a..995b66e1 100644 --- a/tests/integrational/fixtures/twisted/where_now/single.yaml +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -4,7 +4,7 @@ interactions: headers: user-agent: [PubNub-Python-Twisted/4.0.3] method: GET - uri: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-1"]}, "service": "Presence"}'} @@ -12,5 +12,5 @@ interactions: _rawHeaders: user-agent: [PubNub-Python-Twisted/4.0.3] status: {code: 200, message: ''} - url: http://pubsub.pubnub.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f version: 1 From 9d57021ff25ac0be63fcea97fed3fb96b9eb80ef Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 21 Dec 2016 07:26:31 -0800 Subject: [PATCH 438/468] Fix linter warnings --- examples/native_threads/http/app.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/examples/native_threads/http/app.py b/examples/native_threads/http/app.py index b8947495..b9641c0f 100644 --- a/examples/native_threads/http/app.py +++ b/examples/native_threads/http/app.py @@ -45,9 +45,11 @@ def subscribe(): pubnub.subscribe().channels("demo").execute() # TODO: exception doesn't raised, but should inside status() callback + if __name__ == '__main__': subscribe() + atexit.register(pubnub.unsubscribe().channels('demo').execute) atexit.register(pubnub.stop) From 6da2163cf48401f791bbfb01b53f9ab9a46c4bb2 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 21 Dec 2016 08:58:09 -0800 Subject: [PATCH 439/468] 4.0.4 bump --- .pubnub.yml | 7 ++- CHANGELOG.md | 10 ++++ pubnub/pubnub_core.py | 2 +- setup.py | 2 +- .../groups/add_channel_remove_group.yaml | 16 ++--- .../groups/add_remove_multiple_channels.yaml | 16 ++--- .../groups/add_remove_single_channel.yaml | 20 +++---- .../fixtures/asyncio/here_now/global.yaml | 12 ++-- .../asyncio/here_now/multiple_channels.yaml | 12 ++-- .../asyncio/here_now/single_channel.yaml | 12 ++-- .../asyncio/invocations/envelope.yaml | 4 +- .../asyncio/invocations/envelope_raises.yaml | 4 +- .../fixtures/asyncio/invocations/future.yaml | 4 +- .../future_raises_pubnub_error.yaml | 4 +- .../fixtures/asyncio/pam/global_level.yaml | 12 ++-- .../asyncio/pam/multiple_channel_groups.yaml | 8 +-- .../multiple_channel_groups_with_auth.yaml | 8 +-- .../asyncio/pam/multiple_channels.yaml | 8 +-- .../pam/multiple_channels_with_auth.yaml | 8 +-- .../fixtures/asyncio/pam/single_channel.yaml | 8 +-- .../asyncio/pam/single_channel_group.yaml | 8 +-- .../pam/single_channel_group_with_auth.yaml | 8 +-- .../asyncio/pam/single_channel_with_auth.yaml | 8 +-- .../asyncio/publish/do_not_store.yaml | 4 +- .../fixtures/asyncio/publish/invalid_key.yaml | 4 +- .../fixtures/asyncio/publish/meta_object.yaml | 4 +- .../asyncio/publish/mixed_via_get.yaml | 16 ++--- .../publish/mixed_via_get_encrypted.yaml | 16 ++--- .../asyncio/publish/mixed_via_post.yaml | 16 ++--- .../publish/mixed_via_post_encrypted.yaml | 16 ++--- .../asyncio/publish/not_permitted.yaml | 4 +- .../asyncio/publish/object_via_get.yaml | 4 +- .../publish/object_via_get_encrypted.yaml | 4 +- .../asyncio/publish/object_via_post.yaml | 4 +- .../publish/object_via_post_encrypted.yaml | 4 +- .../fixtures/asyncio/secure/ssl.yaml | 4 +- .../asyncio/state/multiple_channel.yaml | 8 +-- .../asyncio/state/single_channel.yaml | 8 +-- .../single_channel_with_subscription.yaml | 32 +++++----- .../asyncio/subscription/cg_join_leave.yaml | 36 +++++------ .../subscription/cg_sub_pub_unsub.yaml | 24 ++++---- .../asyncio/subscription/cg_sub_unsub.yaml | 16 ++--- .../asyncio/subscription/join_leave.yaml | 28 ++++----- .../asyncio/subscription/sub_pub_unsub.yaml | 16 ++--- .../subscription/sub_pub_unsub_enc.yaml | 16 ++--- .../asyncio/subscription/sub_unsub.yaml | 8 +-- .../asyncio/subscription/unsubscribe_all.yaml | 24 ++++---- .../fixtures/asyncio/time/get.yaml | 4 +- .../asyncio/where_now/multiple_channels.yaml | 12 ++-- .../asyncio/where_now/single_channel.yaml | 12 ++-- .../add_channel_remove_group.yaml | 10 ++-- .../add_remove_multiple_channels.yaml | 10 ++-- .../channel_groups/single_channel.yaml | 10 ++-- .../fixtures/native_sync/history/basic.yaml | 12 ++-- .../fixtures/native_sync/history/encoded.yaml | 12 ++-- .../native_sync/history/not_permitted.yaml | 2 +- .../native_sync/publish/invalid_key.yaml | 2 +- .../native_sync/publish/publish_bool_get.yaml | 4 +- .../publish/publish_bool_post.yaml | 2 +- .../publish/publish_do_not_store.yaml | 2 +- .../publish/publish_encrypted_list_get.yaml | 2 +- .../publish/publish_encrypted_list_post.yaml | 2 +- .../publish/publish_encrypted_string_get.yaml | 2 +- .../publish_encrypted_string_post.yaml | 2 +- .../native_sync/publish/publish_int_get.yaml | 2 +- .../native_sync/publish/publish_int_post.yaml | 2 +- .../native_sync/publish/publish_list_get.yaml | 2 +- .../publish/publish_list_post.yaml | 2 +- .../publish/publish_object_get.yaml | 2 +- .../publish/publish_object_post.yaml | 2 +- .../publish/publish_string_get.yaml | 2 +- .../publish/publish_string_post.yaml | 2 +- .../publish/publish_with_meta.yaml | 2 +- .../fixtures/native_sync/ssl/ssl.yaml | 2 +- .../state/state_of_multiple_channels.yaml | 4 +- .../state/state_of_single_channel.yaml | 4 +- .../add_channel_remove_group.yaml | 8 +-- .../add_remove_multiple_channels.yaml | 8 +-- .../channel_groups/single_channel.yaml | 8 +-- .../state/state_of_multiple_channels.yaml | 4 +- .../state/state_of_single_channel.yaml | 4 +- .../groups/add_channel_remove_group.yaml | 24 ++++---- .../groups/add_remove_multiple_channel.yaml | 24 ++++---- .../groups/add_remove_single_channel.yaml | 24 ++++---- .../fixtures/tornado/heartbeat/timeout.yaml | 60 +++++++++---------- .../fixtures/tornado/here_now/global.yaml | 30 +++++----- .../fixtures/tornado/here_now/multiple.yaml | 24 ++++---- .../fixtures/tornado/here_now/single.yaml | 18 +++--- .../tornado/publish/do_not_store.yaml | 12 ++-- .../fixtures/tornado/publish/invalid_key.yaml | 12 ++-- .../fixtures/tornado/publish/meta_object.yaml | 12 ++-- .../tornado/publish/mixed_via_get.yaml | 48 +++++++-------- .../publish/mixed_via_get_encrypted.yaml | 48 +++++++-------- .../tornado/publish/mixed_via_post.yaml | 48 +++++++-------- .../publish/mixed_via_post_encrypted.yaml | 48 +++++++-------- .../tornado/publish/not_permitted.yaml | 12 ++-- .../tornado/publish/object_via_get.yaml | 12 ++-- .../publish/object_via_get_encrypted.yaml | 12 ++-- .../tornado/publish/object_via_post.yaml | 12 ++-- .../publish/object_via_post_encrypted.yaml | 12 ++-- .../tornado/state/multiple_channel.yaml | 12 ++-- .../tornado/state/single_channel.yaml | 12 ++-- .../tornado/subscribe/group_join_leave.yaml | 40 ++++++------- .../subscribe/group_sub_pub_unsub.yaml | 24 ++++---- .../tornado/subscribe/group_sub_unsub.yaml | 16 ++--- .../tornado/subscribe/join_leave.yaml | 32 +++++----- .../tornado/subscribe/sub_pub_unsub.yaml | 16 ++--- .../fixtures/tornado/subscribe/sub_unsub.yaml | 8 +-- .../subscribe/subscribe_tep_by_step.yaml | 16 ++--- .../tornado/where_now/multiple_channels.yaml | 30 +++++----- .../tornado/where_now/single_channel.yaml | 18 +++--- .../fixtures/twisted/groups/add_channels.yaml | 8 +-- .../twisted/groups/add_single_channel.yaml | 8 +-- .../twisted/groups/list_channels.yaml | 8 +-- .../twisted/groups/remove_channels.yaml | 8 +-- .../twisted/groups/remove_single_channel.yaml | 8 +-- .../fixtures/twisted/here_now/global.yaml | 8 +-- .../fixtures/twisted/here_now/multiple.yaml | 8 +-- .../fixtures/twisted/here_now/single.yaml | 8 +-- .../twisted/publish/do_not_store.yaml | 8 +-- .../fixtures/twisted/publish/forbidden.yaml | 8 +-- .../fixtures/twisted/publish/invalid_key.yaml | 8 +-- .../fixtures/twisted/publish/meta_object.yaml | 8 +-- .../publish/mixed_encrypted_via_get.yaml | 32 +++++----- .../twisted/publish/mixed_via_get.yaml | 32 +++++----- .../twisted/publish/object_via_get.yaml | 8 +-- .../twisted/state/multiple_channels.yaml | 8 +-- .../twisted/state/single_channel.yaml | 8 +-- .../fixtures/twisted/where_now/multiple.yaml | 8 +-- .../fixtures/twisted/where_now/single.yaml | 8 +-- tests/unit/test_utils.py | 2 +- tests/unit/test_vcr_helper.py | 4 +- 132 files changed, 808 insertions(+), 793 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 3409f129..111cc5c6 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.3 +version: 4.0.4 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.4 + date: + changes: + - type: improvement + text: Add reconnection managers - version: v4.0.3 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d5e1f9c..9558587b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +## [v4.0.4](https://github.com/pubnub/python/tree/v4.0.4) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.3...v4.0.4) + + +- ⭐Add reconnection managers + + + ## [v4.0.3](https://github.com/pubnub/python/tree/v4.0.3) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index b7ad1843..9a34d931 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.3" + SDK_VERSION = "4.0.4" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index 929adfaf..b1c716d6 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.3', + version='4.0.4', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', diff --git a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml index f36792d0..d6707004 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_channel_remove_group.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch response: @@ -13,11 +13,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:31 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: @@ -29,11 +29,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:32 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove response: @@ -44,11 +44,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:32 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:33 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml index 93564fb3..c7aba546 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_multiple_channels.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: @@ -13,11 +13,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:28 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: @@ -29,11 +29,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:29 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: @@ -44,11 +44,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:30 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg response: @@ -59,5 +59,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:31 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb version: 1 diff --git a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml index 08fff2c9..a752a633 100644 --- a/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/groups/add_remove_single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?seqn=1 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:26 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-channel-groups-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-channel-group-asyncio-uuid1&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch response: @@ -26,11 +26,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:26 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?add=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg response: @@ -42,11 +42,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:27 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch response: @@ -57,11 +57,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:27 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?remove=test-channel-groups-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-channel-group-asyncio-uuid1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg response: @@ -72,5 +72,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:51:28 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-channel-group-asyncio-uuid2 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-channel-groups-asyncio-cg?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-channel-group-asyncio-uuid2 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/global.yaml b/tests/integrational/fixtures/asyncio/here_now/global.yaml index bacebc57..bb053986 100644 --- a/tests/integrational/fixtures/asyncio/here_now/global.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/global.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:55 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1 response: @@ -33,11 +33,11 @@ interactions: CONTENT-LENGTH: '836', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:57:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: @@ -48,5 +48,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:57:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index 337b216a..e1a72806 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:49 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1 response: @@ -28,11 +28,11 @@ interactions: CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: @@ -43,5 +43,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index e0714cfc..ee42d22a 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?tt=0 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:43 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch response: @@ -26,11 +26,11 @@ interactions: CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave response: @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml index 548ce8db..a11be7c4 100644 --- a/tests/integrational/fixtures/asyncio/invocations/envelope.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/envelope.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:07 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml b/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml index 36c79e22..28e2f1f8 100644 --- a/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/envelope_raises.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22 response: @@ -16,5 +16,5 @@ interactions: CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:10 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} status: {code: 400, message: Bad Request} - url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 + url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future.yaml b/tests/integrational/fixtures/asyncio/invocations/future.yaml index 82ddaa32..ecfd0c4d 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:04 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=b33abd30-f0e6-47af-9922-bd5e2a5485eb&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml index 3c848587..a385f76b 100644 --- a/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml +++ b/tests/integrational/fixtures/asyncio/invocations/future_raises_pubnub_error.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22 response: @@ -16,5 +16,5 @@ interactions: CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:07 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked} status: {code: 400, message: Bad Request} - url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 + url: http://ps.pndsn.com/publish/blah/blah/0/blah/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=c06c6b93-2c6f-49de-9d5f-12b210366651&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/global_level.yaml b/tests/integrational/fixtures/asyncio/pam/global_level.yaml index 73d82dd7..4b45e6e1 100644 --- a/tests/integrational/fixtures/asyncio/pam/global_level.yaml +++ b/tests/integrational/fixtures/asyncio/pam/global_level.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?r=1&uuid=my_uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '180', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:10 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=HoR4kd5kOwKqZ3RHzjVP5HdgmoWAP-L0OzGlf3pLlXA=×tamp=1481896330&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=HoR4kd5kOwKqZ3RHzjVP5HdgmoWAP-L0OzGlf3pLlXA=×tamp=1481896330&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?uuid=my_uuid response: @@ -30,11 +30,11 @@ interactions: CONTENT-LENGTH: '982', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=3DcPzxyRzAGRUteyDwv7b7ro_GHlabAUzPtSkTtfUSU=×tamp=1481896330&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=3DcPzxyRzAGRUteyDwv7b7ro_GHlabAUzPtSkTtfUSU=×tamp=1481896330&uuid=my_uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&r=0&uuid=my_uuid&w=0 response: @@ -46,5 +46,5 @@ interactions: CONTENT-LENGTH: '177', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=0&signature=0sKgzEts2pTJr7twR9Bh9wrfV46VON0yxg9E7tpgRjU=×tamp=1481896331&uuid=my_uuid&w=0 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?m=0&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=0&signature=0sKgzEts2pTJr7twR9Bh9wrfV46VON0yxg9E7tpgRjU=×tamp=1481896331&uuid=my_uuid&w=0 version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml index a7ba3659..1062d7d1 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '274', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VtYBdq4jE9aGehb765EPddcQhQbPxZ0Aqp6YjeMtJpY=×tamp=1481896333&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=VtYBdq4jE9aGehb765EPddcQhQbPxZ0Aqp6YjeMtJpY=×tamp=1481896333&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '413', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=fXT2f9pwZhWWbG-Gaaa0f3l21p5yee4QO-JqrCjBkSU=×tamp=1481896333&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=fXT2f9pwZhWWbG-Gaaa0f3l21p5yee4QO-JqrCjBkSU=×tamp=1481896333&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml index 968b9d64..98622ee6 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channel_groups_with_auth.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&r=1&uuid=my_uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '351', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:14 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=Lokw1jIF_zlAlk8VKfDZGechmTe9u6HaeSnvtaaQtXM=×tamp=1481896333&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=Lokw1jIF_zlAlk8VKfDZGechmTe9u6HaeSnvtaaQtXM=×tamp=1481896333&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1%2Ctest-pam-asyncio-cg2&uuid=my_uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '415', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:14 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=ZgUT1TBwYYEChvdtr2xQS3Ln7YZD2b6R8ktUW44zbkY=×tamp=1481896334&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg1,test-pam-asyncio-cg2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=ZgUT1TBwYYEChvdtr2xQS3Ln7YZD2b6R8ktUW44zbkY=×tamp=1481896334&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml index 91c39284..da025c12 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=test-pam-asyncio-uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '262', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=fBB-FwdPoO45PXR9NvaTIhGagcvDHpNsMFLDwI16k0U=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=fBB-FwdPoO45PXR9NvaTIhGagcvDHpNsMFLDwI16k0U=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=test-pam-asyncio-uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '401', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=eu_KBB6V9wcllZrZ__wfKB5r8MDD6bk2PJFuHu6rYFo=×tamp=1481896332&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=eu_KBB6V9wcllZrZ__wfKB5r8MDD6bk2PJFuHu6rYFo=×tamp=1481896332&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml index da6413f6..9dddc328 100644 --- a/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/multiple_channels_with_auth.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&r=1&uuid=my_uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '331', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=8liy0K_7A7VC6EcZ_lZk7pdQRlQaracysvEprI2OwnY=×tamp=1481896332&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=8liy0K_7A7VC6EcZ_lZk7pdQRlQaracysvEprI2OwnY=×tamp=1481896332&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1%2Ctest-pam-asyncio-ch2&uuid=my_uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '401', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=dbZkXTLoS2rBDyxhUnYv-kCbuYxyxmRzpq_Brl3xKK4=×tamp=1481896332&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch1,test-pam-asyncio-ch2&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=dbZkXTLoS2rBDyxhUnYv-kCbuYxyxmRzpq_Brl3xKK4=×tamp=1481896332&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml index 342ca27f..57a87e08 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&r=1&uuid=my_uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '218', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=VbXpLZNb0qIVR7W5vNsq9xzO8Pbl-TVq2emBPu6TkVg=×tamp=1481896331&uuid=my_uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=VbXpLZNb0qIVR7W5vNsq9xzO8Pbl-TVq2emBPu6TkVg=×tamp=1481896331&uuid=my_uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&uuid=my_uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '282', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=D_DmhzxnuCBeA15JtmXgjTTMvbXg_5ZZ-azpArQSAQc=×tamp=1481896331&uuid=my_uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=D_DmhzxnuCBeA15JtmXgjTTMvbXg_5ZZ-azpArQSAQc=×tamp=1481896331&uuid=my_uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml index 34300745..cd556cda 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '230', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:12 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=BmTSr5gdDP3UkBWaSLt4mBEC9rFFZjNJRR9g_tCxLEQ=×tamp=1481896332&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=BmTSr5gdDP3UkBWaSLt4mBEC9rFFZjNJRR9g_tCxLEQ=×tamp=1481896332&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '294', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=S5p2eOGJ6fXtWge3VGpdwzti7pVNAbUZ05Wb3famUig=×tamp=1481896332&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=S5p2eOGJ6fXtWge3VGpdwzti7pVNAbUZ05Wb3famUig=×tamp=1481896332&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml index d94d3724..8817487b 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_group_with_auth.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&r=1&uuid=test-pam-asyncio-uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '267', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=5TUABkdYUy7WHzCCKrU9H3vPuPZ2gHZAeaDcl7eMA54=×tamp=1481896333&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=5TUABkdYUy7WHzCCKrU9H3vPuPZ2gHZAeaDcl7eMA54=×tamp=1481896333&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&uuid=test-pam-asyncio-uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '266', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:13 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=PlsjUwIg9fE8aGoFJ8exIdRAdX9w58jiU5LiEchEV4U=×tamp=1481896333&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel-group=test-pam-asyncio-cg&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=PlsjUwIg9fE8aGoFJ8exIdRAdX9w58jiU5LiEchEV4U=×tamp=1481896333&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml index 966b5e22..1d0766a9 100644 --- a/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml +++ b/tests/integrational/fixtures/asyncio/pam/single_channel_with_auth.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&r=1&uuid=test-pam-asyncio-uuid&w=1 response: @@ -14,11 +14,11 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&r=1&signature=F4zNd7p_UsQrl_v2vzhJz-ONitOhGhNENOkpddiaxPw=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 + url: http://ps.pndsn.com/v1/auth/grant/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&r=1&signature=F4zNd7p_UsQrl_v2vzhJz-ONitOhGhNENOkpddiaxPw=×tamp=1481896331&uuid=test-pam-asyncio-uuid&w=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&uuid=test-pam-asyncio-uuid response: @@ -30,5 +30,5 @@ interactions: CONTENT-LENGTH: '246', CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Fri, 16 Dec 2016 13:52:11 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&signature=zuuexSpQPVHApIDglAa2RRJFUycU2nvya_GshRBd8V0=×tamp=1481896331&uuid=test-pam-asyncio-uuid + url: http://ps.pndsn.com/v1/auth/audit/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f?auth=test-pam-asyncio-auth&channel=test-pam-asyncio-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&signature=zuuexSpQPVHApIDglAa2RRJFUycU2nvya_GshRBd8V0=×tamp=1481896331&uuid=test-pam-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml index ef5e1f66..704723ff 100644 --- a/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/asyncio/publish/do_not_store.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?store=0 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&store=0&uuid=dc05f6a6-e648-4cf1-bbfa-b212ef5945e6&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&store=0&uuid=dc05f6a6-e648-4cf1-bbfa-b212ef5945e6&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml index 200e4e06..435e83b9 100644 --- a/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/asyncio/publish/invalid_key.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '37', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:55 GMT'} status: {code: 400, message: INVALID} - url: http://ps.pndsn.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=67af3c55-453e-45f7-bdbd-294d5499cd88&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/fake/demo/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=67af3c55-453e-45f7-bdbd-294d5499cd88&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml index 77e6fe4a..4202e1e1 100644 --- a/tests/integrational/fixtures/asyncio/publish/meta_object.yaml +++ b/tests/integrational/fixtures/asyncio/publish/meta_object.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=5cf73370-124e-4bc0-8d93-ce450d3dbfe3&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=5cf73370-124e-4bc0-8d93-ce450d3dbfe3&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml index 9d26238e..24e4915b 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=4&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=4&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22 response: @@ -24,11 +24,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?seqn=1&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hi%22?seqn=1&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true response: @@ -37,11 +37,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:53 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?seqn=3&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/true?seqn=3&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5 response: @@ -50,5 +50,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?seqn=2&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/5?seqn=2&uuid=ec1fa148-ba88-4d0a-93fb-748bf50599a9&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml index fb7c3ead..a743adda 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22 response: @@ -24,11 +24,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=4&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=4&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22 response: @@ -37,11 +37,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22 response: @@ -50,5 +50,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=3&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=3&uuid=9c6be30f-ac59-44ae-9646-4383d4955bd5&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml index b267bdf2..c7877c4f 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml @@ -2,7 +2,7 @@ interactions: - request: body: 'true' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: '"hi"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -24,11 +24,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: '["hi", "hi2", "hi3"]' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -37,11 +37,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: '5' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -50,5 +50,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=36c260f4-12f7-4060-85c1-d34096146bda&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml index d2bf5d0f..8e2bc8f6 100644 --- a/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml @@ -2,7 +2,7 @@ interactions: - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=2&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -24,11 +24,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=3&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -37,11 +37,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -50,5 +50,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=4&uuid=3ced65a6-c223-4602-9f66-be071138f35d&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml index 80bb160f..f0e32788 100644 --- a/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/not_permitted.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22 response: @@ -16,5 +16,5 @@ interactions: CONTENT-ENCODING: gzip, CONTENT-TYPE: text/javascript; charset=UTF-8, DATE: 'Sun, 18 Dec 2016 21:50:55 GMT', SERVER: nginx, TRANSFER-ENCODING: chunked, X-BLOCKS-ENABLED: '0'} status: {code: 403, message: Forbidden} - url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=48600fc7-b3ea-487e-abdc-622c3feec615&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/asyncio-int-publish/0/%22hey%22?seqn=1&uuid=48600fc7-b3ea-487e-abdc-622c3feec615&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml index c3f5494d..9ddd6830 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=be0961fa-1d5e-43ec-83f4-39c8cd91f046&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=be0961fa-1d5e-43ec-83f4-39c8cd91f046&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml index fb974db3..a76198ca 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=3487ec85-56c6-4696-b781-3c6f958da670&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=3487ec85-56c6-4696-b781-3c6f958da670&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml index db97b870..c234109d 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post.yaml @@ -2,7 +2,7 @@ interactions: - request: body: '{"online": true, "name": "Alex"}' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=73b4e16c-38ee-4d54-99f3-2dd4b7f85169&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=73b4e16c-38ee-4d54-99f3-2dd4b7f85169&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml index aa20feab..f44a3862 100644 --- a/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml @@ -2,7 +2,7 @@ interactions: - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:50:54 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=174a9cbe-2737-4184-9888-c4cfe6767ed5&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0?seqn=1&uuid=174a9cbe-2737-4184-9888-c4cfe6767ed5&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/secure/ssl.yaml b/tests/integrational/fixtures/asyncio/secure/ssl.yaml index ff4ff960..ceed53e9 100644 --- a/tests/integrational/fixtures/asyncio/secure/ssl.yaml +++ b/tests/integrational/fixtures/asyncio/secure/ssl.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?seqn=1 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:15 GMT'} status: {code: 200, message: OK} - url: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=784bc904-18af-4e75-981e-bd8e6bfbeb61&seqn=1 + url: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/asyncio-int-publish/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=784bc904-18af-4e75-981e-bd8e6bfbeb61&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml index 112b5b3f..35ab54a6 100644 --- a/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/multiple_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:29 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '229', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:29 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch1,test-state-asyncio-ch2/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel.yaml b/tests/integrational/fixtures/asyncio/state/single_channel.yaml index 2f4d591f..a832bb09 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: @@ -13,11 +13,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: @@ -29,5 +29,5 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml index 0a1919f7..d3075feb 100644 --- a/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml +++ b/tests/integrational/fixtures/asyncio/state/single_channel_with_subscription.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:06 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-state-asyncio-ch/0?heartbeat=12&tt=0&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: @@ -25,11 +25,11 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:11 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: @@ -39,11 +39,11 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:16 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: @@ -53,11 +53,11 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:21 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12 response: @@ -67,11 +67,11 @@ interactions: CONTENT-LENGTH: '55', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:26 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/heartbeat?heartbeat=12&uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: @@ -82,11 +82,11 @@ interactions: CONTENT-LENGTH: '96', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:27 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid/data?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid response: @@ -98,11 +98,11 @@ interactions: CONTENT-LENGTH: '167', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:27 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/uuid/test-state-asyncio-uuid?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave response: @@ -113,5 +113,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Sun, 18 Dec 2016 21:28:28 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-state-asyncio-ch/leave?uuid=test-state-asyncio-uuid&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml index 54544c9b..c7ea3e12 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_join_leave.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger response: @@ -13,11 +13,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?add=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tt=0&uuid=test-subscribe-asyncio-listener response: @@ -26,11 +26,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:46 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=0&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963663448174&uuid=test-subscribe-asyncio-listener response: @@ -41,11 +41,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '366', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:47 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963663448174&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=14818963663448174&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group&tt=0&uuid=test-subscribe-asyncio-messenger response: @@ -54,11 +54,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:47 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963671558888&uuid=test-subscribe-asyncio-listener response: @@ -69,11 +69,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '367', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963671558888&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=14818963671558888&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-join-leave-cg-group%2Ctest-subscribe-asyncio-join-leave-cg-group-pnpres&tr=12&tt=14818963680969905&uuid=test-subscribe-asyncio-listener response: @@ -84,11 +84,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '368', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963680969905&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=14818963680969905&uuid=test-subscribe-asyncio-listener&tr=12&channel-group=test-subscribe-asyncio-join-leave-cg-group,test-subscribe-asyncio-join-leave-cg-group-pnpres - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-messenger response: @@ -99,11 +99,11 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-join-leave-cg-group&uuid=test-subscribe-asyncio-listener response: @@ -114,11 +114,11 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-listener&channel-group=test-subscribe-asyncio-join-leave-cg-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&uuid=test-subscribe-asyncio-messenger response: @@ -129,5 +129,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-join-leave-cg-group?remove=test-subscribe-asyncio-join-leave-cg-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml index 6d20b652..354cff55 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_pub_unsub.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel response: @@ -13,11 +13,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 response: @@ -26,11 +26,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=0&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?seqn=1 response: @@ -39,11 +39,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-channel/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tr=12&tt=14818963649240210 response: @@ -52,11 +52,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '277', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=14818963649240210&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&tr=12&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=14818963649240210&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&tr=12&channel-group=test-subscribe-asyncio-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group response: @@ -67,11 +67,11 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64&channel-group=test-subscribe-asyncio-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel response: @@ -82,5 +82,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:45 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=816d9356-41d0-4b1d-ba5c-b3488822ab64 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml index 1ea27d8a..c7f71da8 100644 --- a/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/cg_sub_unsub.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel response: @@ -13,11 +13,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:40 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?add=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=474f7988-1e54-462b-89d4-13e50f26f43c - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=test-subscribe-asyncio-group&tt=0 response: @@ -26,11 +26,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=0&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=test-subscribe-asyncio-group response: @@ -41,11 +41,11 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=474f7988-1e54-462b-89d4-13e50f26f43c&channel-group=test-subscribe-asyncio-group - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel response: @@ -56,5 +56,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:43 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=474f7988-1e54-462b-89d4-13e50f26f43c + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-group?remove=test-subscribe-asyncio-channel&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=474f7988-1e54-462b-89d4-13e50f26f43c version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml index 0a3b9f3b..6b379c93 100644 --- a/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/join_leave.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tt=0&uuid=test-subscribe-asyncio-listener response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-listener&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963579052943&uuid=test-subscribe-asyncio-listener response: @@ -26,11 +26,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '352', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963579052943 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963579052943 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?tt=0&uuid=test-subscribe-asyncio-messenger response: @@ -39,11 +39,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:38 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963588185526&uuid=test-subscribe-asyncio-listener response: @@ -54,11 +54,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '353', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963588185526 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963588185526 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?tr=12&tt=14818963592503447&uuid=test-subscribe-asyncio-listener response: @@ -69,11 +69,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '354', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963592503447 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-join-leave-ch,test-subscribe-asyncio-join-leave-ch-pnpres/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-listener&tr=12&tt=14818963592503447 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-messenger response: @@ -84,11 +84,11 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:39 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?uuid=test-subscribe-asyncio-listener response: @@ -99,5 +99,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:40 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-listener + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-join-leave-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-listener version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml index 9d06a295..c963f4b6 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid-sub response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid-sub&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?seqn=1&uuid=test-subscribe-asyncio-uuid-pub response: @@ -24,11 +24,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-pub&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22hey%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid-pub&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963571353315&uuid=test-subscribe-asyncio-uuid-sub response: @@ -37,11 +37,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '232', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub&tr=12&tt=14818963571353315 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid-sub&tr=12&tt=14818963571353315 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid-sub response: @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid-sub + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid-sub version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml index 63597adf..a14b1e02 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_pub_unsub_enc.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0&uuid=test-subscribe-asyncio-uuid response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&uuid=test-subscribe-asyncio-uuid response: @@ -24,11 +24,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '30', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/test-subscribe-asyncio-ch/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid&seqn=1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tr=12&tt=14818963573055360&uuid=test-subscribe-asyncio-uuid response: @@ -37,11 +37,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '249', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid&tr=12&tt=14818963573055360 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid&tr=12&tt=14818963573055360 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?uuid=test-subscribe-asyncio-uuid response: @@ -52,5 +52,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml index e2994f0e..06e21c66 100644 --- a/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/sub_unsub.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?tt=0 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:36 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave response: @@ -26,5 +26,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:37 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=fe92df45-c879-449d-a403-90a17bb9e6e6 version: 1 diff --git a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml index b1174f68..09ed2650 100644 --- a/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml +++ b/tests/integrational/fixtures/asyncio/subscription/unsubscribe_all.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: @@ -13,11 +13,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: @@ -28,11 +28,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:48 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?add=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&tt=0&uuid=test-subscribe-asyncio-messenger response: @@ -41,11 +41,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&tt=0&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?channel-group=test-subscribe-asyncio-unsubscribe-all-gr2%2Ctest-subscribe-asyncio-unsubscribe-all-gr1&uuid=test-subscribe-asyncio-messenger response: @@ -56,11 +56,11 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-subscribe-asyncio-unsubscribe-all-ch3,test-subscribe-asyncio-unsubscribe-all-ch1,test-subscribe-asyncio-unsubscribe-all-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger&channel-group=test-subscribe-asyncio-unsubscribe-all-gr2,test-subscribe-asyncio-unsubscribe-all-gr1 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: @@ -71,11 +71,11 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr1?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&uuid=test-subscribe-asyncio-messenger response: @@ -86,5 +86,5 @@ interactions: CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT', SERVER: Pubnub} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-subscribe-asyncio-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/test-subscribe-asyncio-unsubscribe-all-gr2?remove=test-subscribe-asyncio-unsubscribe-all-ch&pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-subscribe-asyncio-messenger version: 1 diff --git a/tests/integrational/fixtures/asyncio/time/get.yaml b/tests/integrational/fixtures/asyncio/time/get.yaml index 1a51d33a..1a702bb8 100644 --- a/tests/integrational/fixtures/asyncio/time/get.yaml +++ b/tests/integrational/fixtures/asyncio/time/get.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/time/0 response: @@ -11,5 +11,5 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '19', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:50 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-state-asyncio-uuid + url: http://ps.pndsn.com/time/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-state-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml index 319e11e5..bac000c7 100644 --- a/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/multiple_channels.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?tt=0&uuid=test-where-now-asyncio-uuid response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-where-now-asyncio-uuid&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?uuid=test-where-now-asyncio-uuid response: @@ -26,11 +26,11 @@ interactions: CONTENT-LENGTH: '142', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:53:00 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?uuid=test-where-now-asyncio-uuid response: @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:53:01 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch1,test-where-now-asyncio-ch2/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml index babc386a..3776926c 100644 --- a/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/where_now/single_channel.yaml @@ -2,7 +2,7 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?tt=0 response: @@ -11,11 +11,11 @@ interactions: CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:51 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-where-now-asyncio-ch/0?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-where-now-asyncio-uuid&tt=0 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid response: @@ -26,11 +26,11 @@ interactions: CONTENT-LENGTH: '111', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/test-where-now-asyncio-uuid?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-where-now-asyncio-uuid - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.3] + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave response: @@ -41,5 +41,5 @@ interactions: CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:52:53 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.3&uuid=test-where-now-asyncio-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-where-now-asyncio-ch/leave?pnsdk=PubNub-Python-Asyncio%2F4.0.4&uuid=test-where-now-asyncio-uuid version: 1 diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml index 2f6c1990..64b75854 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_channel_remove_group.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: @@ -53,7 +53,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: @@ -78,7 +78,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: @@ -102,7 +102,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: diff --git a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml index 0442d15e..0e01b79a 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/add_remove_multiple_channels.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: @@ -53,7 +53,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: @@ -78,7 +78,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: @@ -102,7 +102,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: diff --git a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml index 0e23369b..b50fad7f 100644 --- a/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/channel_groups/single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg/remove response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?add=channel-groups-native-ch response: @@ -53,7 +53,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg response: @@ -78,7 +78,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg?remove=channel-groups-native-ch response: @@ -102,7 +102,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-native-cg response: diff --git a/tests/integrational/fixtures/native_sync/history/basic.yaml b/tests/integrational/fixtures/native_sync/history/basic.yaml index 56e7ac17..2df5fae0 100644 --- a/tests/integrational/fixtures/native_sync/history/basic.yaml +++ b/tests/integrational/fixtures/native_sync/history/basic.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-0%22?seqn=1 response: @@ -25,7 +25,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-1%22?seqn=2 response: @@ -45,7 +45,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-2%22?seqn=3 response: @@ -65,7 +65,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-3%22?seqn=4 response: @@ -85,7 +85,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22hey-4%22?seqn=5 response: @@ -105,7 +105,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 response: diff --git a/tests/integrational/fixtures/native_sync/history/encoded.yaml b/tests/integrational/fixtures/native_sync/history/encoded.yaml index 9e6b3deb..410b61f6 100644 --- a/tests/integrational/fixtures/native_sync/history/encoded.yaml +++ b/tests/integrational/fixtures/native_sync/history/encoded.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22QfD1NCBJCmt1aPPGU2cshw%3D%3D%22?seqn=1 response: @@ -25,7 +25,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22cIioHNL2bZY8a%2FMa5fBsAA%3D%3D%22?seqn=2 response: @@ -45,7 +45,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%228YmOnXcBGHtlYIdpGkOvUA%3D%3D%22?seqn=3 response: @@ -65,7 +65,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22arJa5qQszd4hc65Y4Y2CxA%3D%3D%22?seqn=4 response: @@ -85,7 +85,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/history-native-sync-ch/0/%22OJvWYC%2FbWXFvcw%2FTNic9hQ%3D%3D%22?seqn=5 response: @@ -105,7 +105,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/history/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/history-native-sync-ch?count=5 response: diff --git a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml index 02a08f73..75d42ca6 100644 --- a/tests/integrational/fixtures/native_sync/history/not_permitted.yaml +++ b/tests/integrational/fixtures/native_sync/history/not_permitted.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/history/sub-key/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/channel/history-native-sync-ch?count=5&signature=DFG6A6mYSj-s8dj3w_cQNBJdMCPCYeHLpiAgeIbCb-g%3D×tamp=1482099937 response: diff --git a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml index 7cd0ab7d..5d221834 100644 --- a/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/native_sync/publish/invalid_key.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/fake/demo/0/ch1/0/%22hey%22?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml index 594b1858..5399b41b 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml @@ -5,9 +5,9 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.3&seqn=1 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/true?pnsdk=PubNub-Python%2F4.0.4&seqn=1 response: body: {string: '[1,"Sent","14820999376228286"]'} headers: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml index 225aec45..7d650ef0 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_bool_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml index 230ec381..5ef8c59a 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_do_not_store.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?seqn=1&store=0 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml index efc88687..4683f3b7 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_get.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22M1ScRuKXCKfL%2FCQTTWnsvFgm0XoB6QgeMVp0pFTFEZQ%3D%22?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml index 21948755..d3bffdcb 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_list_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml index 368d51b8..fbb8d01c 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_get.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22X6%2B3Pm2irEIUtmFispcmehGTHkVSMTmrmdxgjazaA9Q%3D%22?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml index f7931400..a3d5dfed 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_encrypted_string_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['46'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml index 8c8e792d..176bc776 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_get.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/5?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml index 92b56894..faae9332 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_int_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['1'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml index 6b11da15..c394cd70 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_get.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml index eae0021a..00bf40f2 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_list_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['20'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml index a147e9b2..b0dbf9f2 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_get.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml index 726b6103..3c72af14 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_object_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['32'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml index 0feeab5e..ce3e8c47 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_get.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml index 6aab51b6..20619566 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_string_post.yaml @@ -6,7 +6,7 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['4'] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: POST uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml index 757c1f86..3fe0641b 100644 --- a/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml +++ b/tests/integrational/fixtures/native_sync/publish/publish_with_meta.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22D7oVjBCciNszAo%2FEROu5Jw%3D%3D%22?meta=%7B%22b%22%3A+%22qwer%22%2C+%22a%22%3A+2%7D&seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml index c1bfaa71..17ecf8ee 100644 --- a/tests/integrational/fixtures/native_sync/ssl/ssl.yaml +++ b/tests/integrational/fixtures/native_sync/ssl/ssl.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: https://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/ch1/0/%22hi%22?seqn=1 response: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml index 57614f5c..8b4a20dc 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_multiple_channels.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid response: diff --git a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml index 05d2d40e..9c8be904 100644 --- a/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_sync/state/state_of_single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid response: diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml index 27c47725..ef08f27c 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_channel_remove_group.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: @@ -54,7 +54,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg/remove response: @@ -78,7 +78,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: diff --git a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml index ee2b24f3..6c782de9 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/add_remove_multiple_channels.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: @@ -54,7 +54,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch1%2Cchannel-groups-unit-ch2 response: @@ -78,7 +78,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: diff --git a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml index f72d30ca..a2748e1a 100644 --- a/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/channel_groups/single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?add=channel-groups-unit-ch response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: @@ -54,7 +54,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg?remove=channel-groups-unit-ch response: @@ -78,7 +78,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-unit-cg response: diff --git a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml index cf20137c..a2033e6b 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_multiple_channels.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch-1,state-native-sync-ch-2/uuid/state-native-sync-uuid response: diff --git a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml index ec774da7..2199794d 100644 --- a/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml +++ b/tests/integrational/fixtures/native_threads/state/state_of_single_channel.yaml @@ -5,7 +5,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid/data?state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: @@ -29,7 +29,7 @@ interactions: Accept: ['*/*'] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - User-Agent: [PubNub-Python/4.0.3] + User-Agent: [PubNub-Python/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-native-sync-ch/uuid/state-native-sync-uuid response: diff --git a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml index 3264cd61..6658775c 100644 --- a/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg/remove?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml index 2bc1be52..5bc1d4d3 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4&add=channel-groups-tornado-ch1,channel-groups-tornado-ch2 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch1", "channel-groups-tornado-ch2"], "group": "channel-groups-tornado-cg"}, "service": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['187'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4&remove=channel-groups-tornado-ch1%2Cchannel-groups-tornado-ch2 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch1,channel-groups-tornado-ch2&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml index ab0d8375..d9941f96 100644 --- a/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml +++ b/tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?add=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -41,14 +41,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3&add=channel-groups-tornado-ch + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4&add=channel-groups-tornado-ch - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "payload": {"channels": ["channel-groups-tornado-ch"], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": @@ -85,14 +85,14 @@ interactions: - Content-Length - ['156'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3&remove=channel-groups-tornado-ch + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4&remove=channel-groups-tornado-ch response: body: {string: '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} @@ -128,14 +128,14 @@ interactions: - Content-Length - ['79'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&remove=channel-groups-tornado-ch&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "payload": {"channels": [], "group": "channel-groups-tornado-cg"}, "service": "channel-registry", "error": false}'} @@ -171,5 +171,5 @@ interactions: - Content-Length - ['129'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/channel-groups-tornado-cg?uuid=87e4cc02-04fe-4864-ab09-52d7b0bc2bc3&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml index bd802134..cf80e577 100644 --- a/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml +++ b/tests/integrational/fixtures/tornado/heartbeat/timeout.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341188112072","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341188112072 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14720341188112072 response: body: {string: !!python/unicode '{"t":{"t":"14720341195231188","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341194420285","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034119, "uuid": "heartbeat-tornado-listener", "occupancy": @@ -66,14 +66,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341188112072&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0 response: body: {string: !!python/unicode '{"t":{"t":"14720341194868942","r":12},"m":[]}'} headers: @@ -99,14 +99,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch/0?heartbeat=8&tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341195231188 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14720341195231188 response: body: {string: !!python/unicode '{"t":{"t":"14720341206425665","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341205063074","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "join", "timestamp": 1472034120, "uuid": "heartbeat-tornado-messenger", "occupancy": @@ -134,14 +134,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341195231188&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -176,14 +176,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -218,14 +218,14 @@ interactions: - Age - ['3'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence"}'} headers: @@ -260,14 +260,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/heartbeat?heartbeat=8&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=heartbeat-tornado-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341206425665 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14720341206425665 response: body: {string: !!python/unicode '{"t":{"t":"14720341368999461","r":12},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -295,14 +295,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341206425665&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14720341368999461 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14720341368999461 response: body: {string: !!python/unicode '{"t":{"t":"14720341368363471","r":3},"m":[{"a":"2","f":0,"p":{"t":"14720341367516371","r":1},"k":"sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe","c":"heartbeat-tornado-ch-pnpres","d":{"action": "timeout", "timestamp": 1472034136, "uuid": "heartbeat-tornado-messenger", @@ -330,14 +330,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/heartbeat-tornado-ch,heartbeat-tornado-ch-pnpres/0?tt=14720341368999461&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=heartbeat-tornado-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -373,5 +373,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=heartbeat-tornado-listener + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/heartbeat-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=heartbeat-tornado-listener version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/global.yaml b/tests/integrational/fixtures/tornado/here_now/global.yaml index ec47ad64..e2c4c09f 100644 --- a/tests/integrational/fixtures/tornado/here_now/global.yaml +++ b/tests/integrational/fixtures/tornado/here_now/global.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0 response: body: {string: '{"t":{"t":"14717797368453656","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368952132","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=3&tt=0 response: body: {string: '{"t":{"t":"14717797368988362","r":3},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel2,test-here-now-channel1/0?tr=3&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -142,14 +142,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -185,5 +185,5 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/multiple.yaml b/tests/integrational/fixtures/tornado/here_now/multiple.yaml index 5532794e..f4c2ec68 100644 --- a/tests/integrational/fixtures/tornado/here_now/multiple.yaml +++ b/tests/integrational/fixtures/tornado/here_now/multiple.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"t":{"t":"14717792920472577","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"t":{"t":"14717792933219598","r":3},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=3&uuid=test-here-now-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=3&uuid=test-here-now-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-channel1": {"uuids": ["test-here-now-uuid"], "occupancy": 1}, "test-here-now-channel2": @@ -109,14 +109,14 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/here_now/single.yaml b/tests/integrational/fixtures/tornado/here_now/single.yaml index f5082afc..7a5b7835 100644 --- a/tests/integrational/fixtures/tornado/here_now/single.yaml +++ b/tests/integrational/fixtures/tornado/here_now/single.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0 response: body: {string: '{"t":{"t":"14708495143208374","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:34 GMT'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel/0?tt=0&uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["test-here-now-uuid"], "occupancy": 1}'} @@ -74,14 +74,14 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:38 GMT'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Date - ['Wed, 10 Aug 2016 17:18:39 GMT'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel/leave?uuid=test-here-now-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml index 8c3cb3f9..1203d39d 100644 --- a/tests/integrational/fixtures/tornado/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/tornado/publish/do_not_store.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4&store=0 response: body: {string: '[1,"Sent","14707213568554057"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4&store=0 response: body: {string: '[1,"Sent","14707213569308777"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?store=0&uuid=1e52240e-f46d-4309-b227-196ad53070cd&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml index 05895479..8debf48f 100644 --- a/tests/integrational/fixtures/tornado/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/tornado/publish/invalid_key.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[0,"Invalid Key","14707240653092162"]'} headers: @@ -31,14 +31,14 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[0,"Invalid Key","14707240653816927"]'} headers: @@ -64,5 +64,5 @@ interactions: - Date - ['Tue, 09 Aug 2016 06:27:45 GMT'] status: {code: 400, message: INVALID} - url: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/fake/demo/0/tornado-publish/0/%22hey%22?uuid=efbce3be-6fe8-4225-b03b-b6813b291f7d&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/meta_object.yaml b/tests/integrational/fixtures/tornado/publish/meta_object.yaml index 8ac93fb9..d004374e 100644 --- a/tests/integrational/fixtures/tornado/publish/meta_object.yaml +++ b/tests/integrational/fixtures/tornado/publish/meta_object.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14707233493629583"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+%22qwer%22%7D&pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14707233494525529"]'} headers: @@ -64,5 +64,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hey%22?meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20%22qwer%22%7D&uuid=02c13b1a-5ab8-4e31-841f-5d926189f571&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml index ac5adfc7..4eacd808 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654961878754"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654962988338"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22hi%22?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654963998910"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654965094211"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/5?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654966264107"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654968497326"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/true?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654969624146"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=1&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654971058947"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?seqn=2&uuid=d09bd6c1-5c4d-4355-a76f-adecfe132ebc&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml index c41328a1..9dfd47d0 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654973576283"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654974534808"]'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654975469383"]'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654976370725"]'} headers: @@ -130,14 +130,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654977343057"]'} headers: @@ -163,14 +163,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654978302189"]'} headers: @@ -196,14 +196,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654979370691"]'} headers: @@ -229,14 +229,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=1&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706654980293520"]'} headers: @@ -262,5 +262,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?seqn=2&uuid=ef46bb56-9efa-4d85-8794-dffb8f883275&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml index 3c5f423a..ee23e7eb 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789261217101"]'} headers: @@ -31,14 +31,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"hi"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789261901583"]'} headers: @@ -64,14 +64,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789262581697"]'} headers: @@ -97,14 +97,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '5' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789263258448"]'} headers: @@ -130,14 +130,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789263937508"]'} headers: @@ -163,14 +163,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: 'true' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789264623948"]'} headers: @@ -196,14 +196,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789265622885"]'} headers: @@ -229,14 +229,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '["hi", "hi2", "hi3"]' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706789266306131"]'} headers: @@ -262,5 +262,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&uuid=dd43a67d-45af-45cb-af78-13c18720f404&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml index b6a4d046..49504c09 100644 --- a/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724320847330"]'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"Dt7qBesIhJT2DweUJc2HRQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724321905127"]'} headers: @@ -64,14 +64,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724322939251"]'} headers: @@ -97,14 +97,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"Vx8Hk6iVjiV+Qae1bfMq2w=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724323960752"]'} headers: @@ -130,14 +130,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724325062358"]'} headers: @@ -163,14 +163,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"jw/KAwQAoKtQfHyYrROqSQ=="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724326150829"]'} headers: @@ -196,14 +196,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724327259504"]'} headers: @@ -229,14 +229,14 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: '"6uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8="' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706724328343318"]'} headers: @@ -262,5 +262,5 @@ interactions: - Content-Length - ['30'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=6aba7bea-b223-416e-b9f7-1e5406fc5381&seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml index 13f68255..6a5171a3 100644 --- a/tests/integrational/fixtures/tornado/publish/not_permitted.yaml +++ b/tests/integrational/fixtures/tornado/publish/not_permitted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -46,14 +46,14 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=1&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -94,5 +94,5 @@ interactions: - Transfer-Encoding - [chunked] status: {code: 403, message: Forbidden} - url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?seqn=2&uuid=2bf14161-016e-4d0c-823a-d29acd1b2505&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml index b47a3882..488ca2b2 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706653397219269"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=1&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706653398506519"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%7B%22online%22%3A%20true%2C%20%22name%22%3A%20%22Alex%22%7D?seqn=2&uuid=a21d5862-c1e8-4baf-9fb2-b7e1ea9a05f6&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml index 57d7a749..54848726 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706653400646308"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=1&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706653401928744"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0/%22Kwwg99lDMKM0%2FT%2F3EG49rh%2Bnnex2yBo%2F4kK5L7CC%2FF%2BDtMHVInyW%2FgaiX6J8iUMc%22?seqn=2&uuid=bae44d11-c6ec-4478-b78c-244684ffb7e0&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml index 277034c6..ccfc2e2b 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post.yaml @@ -3,9 +3,9 @@ interactions: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706787329216107"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=1&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff - request: body: '{"online": true, "name": "Alex"}' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706787330184998"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?seqn=2&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=ae3a3afd-d92b-4cb2-a1a8-e93f88d2f6ff version: 1 diff --git a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml index 839eff02..ca5525d9 100644 --- a/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml +++ b/tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml @@ -3,9 +3,9 @@ interactions: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706781595277610"]'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.4&seqn=1 - request: body: '"Kwwg99lDMKM0/T/3EG49rh+nnex2yBo/4kK5L7CC/F+DtMHVInyW/gaiX6J8iUMc"' headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: POST - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '[1,"Sent","14706781596540558"]'} headers: @@ -64,5 +64,5 @@ interactions: - Access-Control-Allow-Methods - [GET] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=2 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/tornado-publish/0?uuid=7313f601-1fc1-4c50-a1b8-2a611f8b86cc&pnsdk=PubNub-Python-Tornado%2F4.0.4&seqn=2 version: 1 diff --git a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml index 64ee8fce..d9c578a5 100644 --- a/tests/integrational/fixtures/tornado/state/multiple_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/multiple_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.4&state=%7B%22count%22%3A+5%2C+%22name%22%3A+%22Alex%22%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.4&state=%7B%22count%22%3A%205%2C%20%22name%22%3A%20%22Alex%22%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"state-tornado-ch2": {"count": 5, "name": "Alex"}, "state-tornado-ch1": {"count": 5, "name": "Alex"}}}, @@ -85,5 +85,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch1,state-tornado-ch2/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/state/single_channel.yaml b/tests/integrational/fixtures/tornado/state/single_channel.yaml index b7d9c1e5..212771fb 100644 --- a/tests/integrational/fixtures/tornado/state/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/state/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.4&state=%7B%22name%22%3A+%22Alex%22%2C+%22count%22%3A+5%7D response: body: {string: '{"status": 200, "message": "OK", "payload": {"count": 5, "name": "Alex"}, "service": "Presence"}'} @@ -41,14 +41,14 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.3&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid/data?pnsdk=PubNub-Python-Tornado%2F4.0.4&state=%7B%22name%22%3A%20%22Alex%22%2C%20%22count%22%3A%205%7D&uuid=state-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "uuid": "state-tornado-uuid", "service": "Presence", "message": "OK", "payload": {"count": 5, "name": "Alex"}, "channel": "state-tornado-ch"}'} @@ -84,5 +84,5 @@ interactions: - Connection - [close] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=state-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/state-tornado-ch/uuid/state-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=state-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml index ab1ff2a2..491fc202 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel response: @@ -41,12 +41,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?add=subscribe-test-channel&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tt=0 response: @@ -74,12 +74,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869649333428 response: @@ -109,12 +109,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869649333428&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14818869649333428&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&tt=0 response: @@ -142,12 +142,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=test-subscribe-messenger + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869660519117 response: @@ -177,12 +177,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869660519117&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14818869660519117&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group response: @@ -220,12 +220,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-subscribe-messenger - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869669268862 response: @@ -255,12 +255,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869669268862&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14818869669268862&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group%2Csubscribe-test-group-pnpres&tr=12&tt=14818869671710838 response: @@ -290,12 +290,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869671710838&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-test-group,subscribe-test-group-pnpres&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14818869671710838&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group response: @@ -333,12 +333,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-listener + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-test-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-subscribe-listener - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?remove=subscribe-test-channel response: @@ -376,5 +376,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-subscribe-messenger&remove=subscribe-test-channel + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-test-group?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-subscribe-messenger&remove=subscribe-test-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml index 80e8ab74..54770c32 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel response: @@ -41,12 +41,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 response: @@ -74,12 +74,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22 response: @@ -107,12 +107,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-unsubscribe-channel/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4&seqn=1&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tr=12&tt=14818869687160475 response: @@ -140,12 +140,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=14818869687160475&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=14818869687160475&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group response: @@ -183,12 +183,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel response: @@ -226,5 +226,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09&remove=subscribe-unsubscribe-channel + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=eb63e8cb-b81c-4ccc-b411-bb53264e3c09&remove=subscribe-unsubscribe-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml index 49d7cbe8..0d73d43b 100644 --- a/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel response: @@ -41,12 +41,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?add=subscribe-unsubscribe-channel&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&tt=0 response: @@ -74,12 +74,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0&uuid=709e16b4-d30b-4854-98c2-c4e965564abb + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/,/0?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group response: @@ -117,12 +117,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/,/leave?channel-group=subscribe-unsubscribe-group&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=709e16b4-d30b-4854-98c2-c4e965564abb - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?remove=subscribe-unsubscribe-channel response: @@ -160,5 +160,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=709e16b4-d30b-4854-98c2-c4e965564abb&remove=subscribe-unsubscribe-channel + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/subscribe-unsubscribe-group?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=709e16b4-d30b-4854-98c2-c4e965564abb&remove=subscribe-unsubscribe-channel version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml index 4166280e..58076023 100644 --- a/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/join_leave.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0 response: @@ -31,12 +31,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869603870494 response: @@ -66,12 +66,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869603870494&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869603870494&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: @@ -99,12 +99,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869613057835 response: @@ -134,12 +134,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869613057835&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869613057835&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869622225817 response: @@ -169,12 +169,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869622225817&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869622225817&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: @@ -212,12 +212,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-messenger-3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=subscribe-tornado-messenger-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tr=12&tt=14818869626041325 response: @@ -247,12 +247,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869626041325&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch,subscribe-tornado-ch-pnpres/0?tt=14818869626041325&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=subscribe-tornado-listener-3 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: @@ -290,5 +290,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=subscribe-tornado-listener-3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=subscribe-tornado-listener-3 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml index 6bc1d69a..b5934a99 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: @@ -31,12 +31,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22 response: @@ -64,12 +64,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.3&seqn=1&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/subscribe-tornado-ch/0/%22hey%22?pnsdk=PubNub-Python-Tornado%2F4.0.4&seqn=1&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tr=12&tt=14818869631121257 response: @@ -97,12 +97,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=14818869631121257&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=14818869631121257&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: @@ -140,5 +140,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=18aa1154-a3bd-4e71-994d-8685b56eeecc version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml index 692c1ff7..44debda4 100644 --- a/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0 response: @@ -31,12 +31,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/subscribe-tornado-ch/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=5107666e-798c-459b-89b2-5329353ea8e1 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave response: @@ -74,5 +74,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=5107666e-798c-459b-89b2-5329353ea8e1 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/subscribe-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=5107666e-798c-459b-89b2-5329353ea8e1 version: 1 diff --git a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml index f2fea9c3..42e38e7d 100644 --- a/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml +++ b/tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml @@ -3,7 +3,7 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0 response: @@ -31,12 +31,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tr=12&tt=0 response: @@ -64,12 +64,12 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-channel1,test-here-now-channel2,test-here-now-channel3/0?tt=0&pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2 response: @@ -109,12 +109,12 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave response: @@ -152,5 +152,5 @@ interactions: - Age - ['0'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=test-here-now-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-channel1,test-here-now-channel2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=test-here-now-uuid version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml index 0425861e..73cb3d4e 100644 --- a/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0 response: body: {string: '{"t":{"t":"14717822576549802","r":12},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1/0?tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577171975","r":12},"m":[]}'} headers: @@ -64,14 +64,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tr=12&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tr=12&tt=0 response: body: {string: '{"t":{"t":"14717822577229301","r":12},"m":[]}'} headers: @@ -97,14 +97,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch1,where-now-tornado-ch2/0?tr=12&tt=0&uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch2", "where-now-tornado-ch1"]}, "service": "Presence"}'} @@ -140,14 +140,14 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -183,5 +183,5 @@ interactions: - Server - [Pubnub Presence] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.3 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch1,where-now-tornado-ch2/leave?uuid=where-now-tornado-uuid&pnsdk=PubNub-Python-Tornado%2F4.0.4 version: 1 diff --git a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml index fecd256f..c4ea740e 100644 --- a/tests/integrational/fixtures/tornado/where_now/single_channel.yaml +++ b/tests/integrational/fixtures/tornado/where_now/single_channel.yaml @@ -3,9 +3,9 @@ interactions: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&tt=0 + uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&tt=0 response: body: {string: '{"t":{"t":"14717827927747241","r":3},"m":[]}'} headers: @@ -31,14 +31,14 @@ interactions: - Content-Type - [text/javascript; charset="UTF-8"] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid&tt=0 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/where-now-tornado-ch/0?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=where-now-tornado-uuid&tt=0 - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "message": "OK", "payload": {"channels": ["where-now-tornado-ch"]}, "service": "Presence"}'} @@ -74,14 +74,14 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/where-now-tornado-uuid?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=where-now-tornado-uuid - request: body: null headers: Accept-Encoding: [utf-8] - User-Agent: [PubNub-Python-Tornado/4.0.3] + User-Agent: [PubNub-Python-Tornado/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4 response: body: {string: '{"status": 200, "action": "leave", "message": "OK", "service": "Presence"}'} @@ -117,5 +117,5 @@ interactions: - Access-Control-Allow-Origin - ['*'] status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.3&uuid=where-now-tornado-uuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/where-now-tornado-ch/leave?pnsdk=PubNub-Python-Tornado%2F4.0.4&uuid=where-now-tornado-uuid version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_channels.yaml b/tests/integrational/fixtures/twisted/groups/add_channels.yaml index 7c86da7b..ea1c56e4 100644 --- a/tests/integrational/fixtures/twisted/groups/add_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0%2Ccgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc0,cgttc1&pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml index 559cef81..ed06f381 100644 --- a/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/add_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?add=cgttc&pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/list_channels.yaml b/tests/integrational/fixtures/twisted/groups/list_channels.yaml index 7a8dd9b6..531de4f9 100644 --- a/tests/integrational/fixtures/twisted/groups/list_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/list_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "payload": {"channels": ["cgttc0", "cgttc1"], "group": "cgttg"}, "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=4b7a6c42-966f-41ad-a395-c9e9ef5919ec version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml index ab404470..540e2127 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_channels.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc0%2Ccgttc1 + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.4&remove=cgttc0%2Ccgttc1 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc0,cgttc1 version: 1 diff --git a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml index cb867253..e992888f 100644 --- a/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml +++ b/tests/integrational/fixtures/twisted/groups/remove_single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&remove=cgttc + uri: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.4&remove=cgttc response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "channel-registry", "error": false}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc + url: http://ps.pndsn.com/v1/channel-registration/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel-group/cgttg?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=a88dfb31-755d-4db4-844e-0b56b0699f92&remove=cgttc version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/global.yaml b/tests/integrational/fixtures/twisted/here_now/global.yaml index 21b88b0c..9d9d53a8 100644 --- a/tests/integrational/fixtures/twisted/here_now/global.yaml +++ b/tests/integrational/fixtures/twisted/here_now/global.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": @@ -12,7 +12,7 @@ interactions: 1}}, "total_channels": 2, "total_occupancy": 2}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/multiple.yaml b/tests/integrational/fixtures/twisted/here_now/multiple.yaml index e396280e..3a131396 100644 --- a/tests/integrational/fixtures/twisted/here_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/here_now/multiple.yaml @@ -2,16 +2,16 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": {"twisted-test-1": {"uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}}, "total_channels": 1, "total_occupancy": 1}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-1,twisted-test-1?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/here_now/single.yaml b/tests/integrational/fixtures/twisted/here_now/single.yaml index 4858ee32..d9740977 100644 --- a/tests/integrational/fixtures/twisted/here_now/single.yaml +++ b/tests/integrational/fixtures/twisted/here_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "service": "Presence", "uuids": ["00de2586-7ad8-4955-b5f6-87cae3215d02"], "occupancy": 1}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=9c7b940a-e5c7-42d5-af9b-c6ddcf58bdc9 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml index cd5f6b50..f60ce282 100644 --- a/tests/integrational/fixtures/twisted/publish/do_not_store.yaml +++ b/tests/integrational/fixtures/twisted/publish/do_not_store.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&store=0 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&store=0 response: body: {string: !!python/unicode '[1,"Sent","14768809388217046"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22whatever%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=359b199b-9f4f-4368-bbc8-33e09b28a280&store=0&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/forbidden.yaml b/tests/integrational/fixtures/twisted/publish/forbidden.yaml index be3f37b9..3906efc5 100644 --- a/tests/integrational/fixtures/twisted/publish/forbidden.yaml +++ b/tests/integrational/fixtures/twisted/publish/forbidden.yaml @@ -2,9 +2,9 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 + uri: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng%3D×tamp=1477397184 response: body: {string: '{"message":"Forbidden","payload":{"channels":["not_permitted_channel"]},"error":true,"service":"Access Manager","status":403} @@ -12,7 +12,7 @@ interactions: '} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 403, message: ''} - url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.3&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e + url: http://ps.pndsn.com/publish/pub-c-98863562-19a6-4760-bf0b-d537d1f5c582/sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f/0/not_permitted_channel/0/%22hey%22?timestamp=1477397184&pnsdk=PubNub-Python-Twisted%2F4.0.4&signature=oZNiMOxZ6Zg-pAnPpdrQ7rLM2n4Vmk_p8wewWF51wng=&seqn=1&uuid=c7accbb8-2606-41bb-9484-7cea7e13817e version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml index cdf88d22..885d0011 100644 --- a/tests/integrational/fixtures/twisted/publish/invalid_key.yaml +++ b/tests/integrational/fixtures/twisted/publish/invalid_key.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[0,"Invalid Key","14767989321048626"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 400, message: ''} - url: http://ps.pndsn.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 + url: http://ps.pndsn.com/publish/fake/demo/0/twisted-test/0/%22hey%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=7b9b30d1-27b5-4764-bbee-60c7c584b04d&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/meta_object.yaml b/tests/integrational/fixtures/twisted/publish/meta_object.yaml index 8ee7d5ac..9753f6c8 100644 --- a/tests/integrational/fixtures/twisted/publish/meta_object.yaml +++ b/tests/integrational/fixtures/twisted/publish/meta_object.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?meta=%7B%22a%22%3A+2%2C+%22b%22%3A+true%7D&pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14768802793338041"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&meta=%7B%22a%22%3A%202%2C%20%22b%22%3A%20true%7D&uuid=b299acc9-2b04-46ff-aab2-945c0c7f0678&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml index 9363f219..cf6b666b 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_encrypted_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14768059311032132"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Dt7qBesIhJT2DweUJc2HRQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=16bfed08-6b5a-4d83-ac10-a37b800d5f3a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14768059313886330"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22Vx8Hk6iVjiV%2BQae1bfMq2w%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=00072bd8-45b7-42ac-9f54-f238c4af89b4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14768059316467095"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22jw%2FKAwQAoKtQfHyYrROqSQ%3D%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=192154f7-3211-4677-8d8a-92b8bf25aff4&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14768059389216173"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%226uNMePrQmuhzydmUEs6KAl8teZTZfCbG27ApFSKyfr8%3D%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=014b69e9-2481-47cb-8239-a8cc56b24502&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml index 744cbd1a..4b165ba5 100644 --- a/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/mixed_via_get.yaml @@ -2,53 +2,53 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14767908153114904"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%22hi%22?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14767908155795869"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/5?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=2 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14767908158387685"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/true?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=3 - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14767908161061457"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%5B%22hi%22%2C%20%22hi2%22%2C%20%22hi3%22%5D?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=4 version: 1 diff --git a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml index 6aebc2fe..7967acb3 100644 --- a/tests/integrational/fixtures/twisted/publish/object_via_get.yaml +++ b/tests/integrational/fixtures/twisted/publish/object_via_get.yaml @@ -2,14 +2,14 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '[1,"Sent","14767908163698950"]'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 + url: http://ps.pndsn.com/publish/pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/0/twisted-test/0/%7B%22three%22%3A%20true%2C%20%22one%22%3A%202%7D?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=1ae81865-e92f-4c23-8e21-684a7bcdbe8a&seqn=1 version: 1 diff --git a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml index a72bb0f5..4735109d 100644 --- a/tests/integrational/fixtures/twisted/state/multiple_channels.yaml +++ b/tests/integrational/fixtures/twisted/state/multiple_channels.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.4&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test-0,twisted-test-1/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/state/single_channel.yaml b/tests/integrational/fixtures/twisted/state/single_channel.yaml index 95faa0b1..73e43c3c 100644 --- a/tests/integrational/fixtures/twisted/state/single_channel.yaml +++ b/tests/integrational/fixtures/twisted/state/single_channel.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.3&state=%7B%22whatever%22%3A+%22something%22%7D + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?pnsdk=PubNub-Python-Twisted%2F4.0.4&state=%7B%22whatever%22%3A+%22something%22%7D response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"whatever": "something"}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=someuuid + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/twisted-test/uuid/someuuid/data?state=%7B%22whatever%22%3A%20%22something%22%7D&pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=someuuid version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/multiple.yaml b/tests/integrational/fixtures/twisted/where_now/multiple.yaml index 7c62c3ed..d4a3f1a4 100644 --- a/tests/integrational/fixtures/twisted/where_now/multiple.yaml +++ b/tests/integrational/fixtures/twisted/where_now/multiple.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-2", "twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=d8f596f2-dc2c-4015-af8a-73374f770590 version: 1 diff --git a/tests/integrational/fixtures/twisted/where_now/single.yaml b/tests/integrational/fixtures/twisted/where_now/single.yaml index 995b66e1..50deae83 100644 --- a/tests/integrational/fixtures/twisted/where_now/single.yaml +++ b/tests/integrational/fixtures/twisted/where_now/single.yaml @@ -2,15 +2,15 @@ interactions: - request: body: !!python/unicode headers: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] method: GET - uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3 + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.4 response: body: {string: !!python/unicode '{"status": 200, "message": "OK", "payload": {"channels": ["twisted-test-1"]}, "service": "Presence"}'} headers: !!python/object:twisted.web.http_headers.Headers _rawHeaders: - user-agent: [PubNub-Python-Twisted/4.0.3] + user-agent: [PubNub-Python-Twisted/4.0.4] status: {code: 200, message: ''} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.3&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/uuid/00de2586-7ad8-4955-b5f6-87cae3215d02?pnsdk=PubNub-Python-Twisted%2F4.0.4&uuid=16de4bd1-c7a2-4913-9617-5ea0f624be4f version: 1 diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index a9280f2d..1eac632e 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -72,7 +72,7 @@ def test_sign_sha_256(self): input = """sub-c-7ba2ac4c-4836-11e6-85a4-0619f8945a4f pub-c-98863562-19a6-4760-bf0b-d537d1f5c582 grant -channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.3&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 +channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.4&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) assert "mLDxOYJvrvRIDryzqNhoRsE4-Pz26KVzqCAI7hkXdEQ=" == result diff --git a/tests/unit/test_vcr_helper.py b/tests/unit/test_vcr_helper.py index 7994d74d..1ec1cfc1 100644 --- a/tests/unit/test_vcr_helper.py +++ b/tests/unit/test_vcr_helper.py @@ -26,10 +26,10 @@ def test_string_list_in_path_matcher(self): def test_string_list_in_path_query_matcher(self): r1 = Request( - query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.3'), + query=[('channel', 'test-pam-asyncio-ch1,test-pam-asyncio-ch2'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.4'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) r2 = Request( - query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.3'), + query=[('channel', 'test-pam-asyncio-ch2,test-pam-asyncio-ch1'), ('pnsdk', 'PubNub-Python-Asyncio/4.0.4'), ('r', '1'), ('uuid', 'test-pam-asyncio-uuid'), ('w', '1')]) assert string_list_in_query_matcher(r1, r2, ['channel']) From 6edc4326ffe652e5f4f3db4e10aaaa6e0ea028e1 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 21 Dec 2016 09:01:57 -0800 Subject: [PATCH 440/468] update hash --- tests/unit/test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 1eac632e..109df187 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -75,4 +75,4 @@ def test_sign_sha_256(self): channel=asyncio-pam-FI2FCS0A&pnsdk=PubNub-Python-Asyncio%252F4.0.4&r=1×tamp=1468409553&uuid=a4dbf92e-e5cb-428f-b6e6-35cce03500a2&w=1""" # noqa: E501 result = utils.sign_sha256("my_key", input) - assert "mLDxOYJvrvRIDryzqNhoRsE4-Pz26KVzqCAI7hkXdEQ=" == result + assert "zXtkplNSczgpsfhaYajoEfQnIgRTUCgE9AE6Y0mS_J8=" == result From a71f30dc2a91a4479514f5b69c5914de4bcac0d1 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Dec 2016 06:41:23 -0800 Subject: [PATCH 441/468] Fix Ctrl+C bug --- pubnub/pubnub.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index e8737ed0..eb9ae1a6 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -91,12 +91,14 @@ def _register_heartbeat_timer(self): self._recalculate_interval() self._timer = threading.Timer(self._timer_interval, self._call_time) + self._timer.setDaemon(True) self._timer.start() def _call_time(self): self._pubnub.time().async(self._call_time_callback) def _call_time_callback(self, resp, status): + # REMOVE print(resp) if not status.is_error(): @@ -247,6 +249,7 @@ def _start_worker(self): self._message_queue, self._consumer_event) self._consumer_thread = threading.Thread(target=consumer.run, name="SubscribeMessageWorker") + self._consumer_thread.setDaemon(True) self._consumer_thread.start() def _start_subscribe_loop(self): @@ -327,6 +330,7 @@ def _run(self): def _schedule_next(self): self._timeout = threading.Timer(self._callback_time, self._run) + self._timeout.setDaemon(True) self._timeout.start() From 9dedebd0059f2221ac0c768b1633872aa42409b7 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Dec 2016 06:42:33 -0800 Subject: [PATCH 442/468] Remove print() statement from reconnection manager --- pubnub/pubnub.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index eb9ae1a6..17a71492 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -98,9 +98,6 @@ def _call_time(self): self._pubnub.time().async(self._call_time_callback) def _call_time_callback(self, resp, status): - # REMOVE - print(resp) - if not status.is_error(): self._connection_errors = 1 self.stop_heartbeat_timer() From c79f2fccb58bcb1fc30caeff852c3daafcdd8e75 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Dec 2016 13:10:35 -0800 Subject: [PATCH 443/468] Add default event canceller for request --- pubnub/request_handlers/requests_handler.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index 1e1ca12d..f1c0085a 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -36,6 +36,9 @@ def sync_request(self, platform_options, endpoint_call_options): def async_request(self, endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event): call = Call() + if cancellation_event is None: + cancellation_event = threading.Event() + def callback_to_invoke_in_another_thread(): try: envelope = self._build_envelope(platform_options, endpoint_call_options) From f3683947550598fe444095f37ac960c2637eb29a Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 25 Dec 2016 13:29:19 -0800 Subject: [PATCH 444/468] Temporarily disable Requests connections pooling --- pubnub/request_handlers/requests_handler.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index f1c0085a..2f62de1f 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -4,7 +4,7 @@ import six from requests import Session -from requests.adapters import HTTPAdapter +# from requests.adapters import HTTPAdapter from pubnub import utils from pubnub.enums import PNStatusCategory @@ -25,8 +25,9 @@ class RequestsRequestHandler(BaseRequestHandler): def __init__(self, pubnub): self.session = Session() - self.session.mount('http://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) - self.session.mount('https://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + # TODO: fix timeout caching + # self.session.mount('http://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + # self.session.mount('https://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) self.pubnub = pubnub From 4d7930fdaac9a06d2bc40d1bf137b70671c3ccf6 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Mon, 26 Dec 2016 10:23:07 -0800 Subject: [PATCH 445/468] Add fixed HTTPAdapter config --- pubnub/request_handlers/requests_handler.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index 2f62de1f..c58f6ef7 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -4,7 +4,7 @@ import six from requests import Session -# from requests.adapters import HTTPAdapter +from requests.adapters import HTTPAdapter from pubnub import utils from pubnub.enums import PNStatusCategory @@ -25,9 +25,10 @@ class RequestsRequestHandler(BaseRequestHandler): def __init__(self, pubnub): self.session = Session() - # TODO: fix timeout caching - # self.session.mount('http://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) - # self.session.mount('https://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('http://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('https://ps.pndsn.com', HTTPAdapter(max_retries=1, pool_maxsize=500)) + self.session.mount('http://ps.pndsn.com/v2/subscribe', HTTPAdapter(pool_maxsize=500)) + self.session.mount('https://ps.pndsn.com/v2/subscribe', HTTPAdapter(pool_maxsize=500)) self.pubnub = pubnub From 59673ada768ff883eb6afaecfe5734bd7e3f1df8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 29 Dec 2016 12:59:45 -0800 Subject: [PATCH 446/468] Add native http demo app --- examples/native_threads/http/app.py | 117 +++++++++++++++++++++------- 1 file changed, 91 insertions(+), 26 deletions(-) diff --git a/examples/native_threads/http/app.py b/examples/native_threads/http/app.py index b9641c0f..6b017fd3 100644 --- a/examples/native_threads/http/app.py +++ b/examples/native_threads/http/app.py @@ -1,58 +1,123 @@ -# subscribe to pubnub channel, push messages into the queue, -# queue worker send send them to cli import logging import os import sys -import atexit +import time + +from flask import Flask, jsonify +from flask import request d = os.path.dirname PUBNUB_ROOT = d(d(d(os.path.dirname(os.path.abspath(__file__))))) sys.path.append(PUBNUB_ROOT) import pubnub as pn - -from pubnub.callbacks import SubscribeCallback +from pubnub import utils +from pubnub.exceptions import PubNubException from pubnub.pnconfiguration import PNConfiguration from pubnub.pubnub import PubNub + pn.set_stream_logger('pubnub', logging.DEBUG) logger = logging.getLogger("myapp") +app = Flask(__name__) + pnconfig = PNConfiguration() -pnconfig.publish_key = "demo" -pnconfig.subscribe_key = "demo" +pnconfig.subscribe_request_timeout = 10 +pnconfig.subscribe_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" +pnconfig.publish_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" +pnconfig.uuid = "pubnub-demo-api-python-backend" +DEFAULT_CHANNEL = "pubnub_demo_api_python_channel" +EVENTS_CHANNEL = "pubnub_demo_api_python_events" +APP_KEY = utils.uuid() pubnub = PubNub(pnconfig) logger.info("SDK Version: %s", pubnub.SDK_VERSION) -original_sigint = None +@app.route("/app_key") +def app_key(): + return { + 'app_key': APP_KEY + } -class MyListener(SubscribeCallback): - def presence(self, pubnub, presence): - pass - def status(self, pubnub, status): - print("Status changed, new status: %s" % status) +@app.route("/subscription/add") +def subscription_add(): + channel = request.args.get('channel') - def message(self, pubnub, message): - print("Message %s" % message) + if channel is None: + return jsonify({ + "error": "Channel missing" + }), 500 + pubnub.subscribe().channels(channel).execute() + return jsonify({ + 'subscribed_channels': pubnub.get_subscribed_channels() + }) -def subscribe(): - listener = MyListener() - pubnub.add_listener(listener) - pubnub.subscribe().channels("demo").execute() - # TODO: exception doesn't raised, but should inside status() callback +@app.route("/subscription/remove") +def subscription_remove(): + channel = request.args.get('channel') -if __name__ == '__main__': - subscribe() + if channel is None: + return jsonify({ + "error": "Channel missing" + }), 500 + + pubnub.unsubscribe().channels(channel).execute() + + return jsonify({ + 'subscribed_channels': pubnub.get_subscribed_channels() + }) + + +@app.route("/subscription/list") +def subscription_list(): + return jsonify({ + 'subscribed_channels': pubnub.get_subscribed_channels() + }) -atexit.register(pubnub.unsubscribe().channels('demo').execute) -atexit.register(pubnub.stop) +@app.route('/publish/sync') +def publish_sync(): + channel = request.args.get('channel') -# TODO: await + if channel is None: + return jsonify({ + "error": "Channel missing" + }), 500 -# pubnub.stop() + try: + envelope = pubnub.publish().channel(channel).message("hello from yield-based publish").sync() + return jsonify({ + "original_response": str(envelope.status.original_response) + }) + except PubNubException as e: + return jsonify({ + "message": str(e) + }), 500 + + +@app.route('/publish/async') +def publish_async(): + channel = request.args.get('channel') + + if channel is None: + return jsonify({ + "error": "Channel missing" + }), 500 + + def stub(res, state): pass + + pubnub.publish().channel(channel).message("hello from yield-based publish")\ + .async(stub) + + return jsonify({ + "message": "Publish task scheduled" + }) + +if __name__ == '__main__': + app.run(host='0.0.0.0') + time.sleep(100) From db59513c26c7e7c4ee9f225f112d9f9402529b21 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 3 Jan 2017 09:13:34 -0800 Subject: [PATCH 447/468] Fix codestyle --- examples/native_threads/http/app.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/native_threads/http/app.py b/examples/native_threads/http/app.py index 6b017fd3..08529116 100644 --- a/examples/native_threads/http/app.py +++ b/examples/native_threads/http/app.py @@ -109,7 +109,8 @@ def publish_async(): "error": "Channel missing" }), 500 - def stub(res, state): pass + def stub(res, state): + pass pubnub.publish().channel(channel).message("hello from yield-based publish")\ .async(stub) @@ -118,6 +119,7 @@ def stub(res, state): pass "message": "Publish task scheduled" }) + if __name__ == '__main__': app.run(host='0.0.0.0') time.sleep(100) From 0b4524d16e829b5c11a5d1b03a3a30b1e7e3b2a8 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 3 Jan 2017 09:15:13 -0800 Subject: [PATCH 448/468] Add stable Python 3.6.0 version support --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d6bceb97..d97dbdfd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ python: - "3.3" - "3.4.4" - "3.5" + - "3.6" - "pypy" sudo: false install: From f88ea5dd3f5a18eb23de5f51d037bf01ff3e4262 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 3 Jan 2017 11:10:04 -0800 Subject: [PATCH 449/468] Add pnsdk to vcr ignored query fields --- .../integrational/native_sync/test_publish.py | 2 +- .../tornado/test_channel_groups.py | 6 ++--- tests/integrational/tornado/test_heartbeat.py | 2 +- tests/integrational/tornado/test_here_now.py | 6 ++--- .../integrational/tornado/test_invocations.py | 4 ++-- tests/integrational/tornado/test_publish.py | 24 +++++++++---------- tests/integrational/tornado/test_state.py | 4 ++-- tests/integrational/tornado/test_subscribe.py | 14 +++++------ tests/integrational/tornado/test_where_now.py | 4 ++-- 9 files changed, 33 insertions(+), 33 deletions(-) diff --git a/tests/integrational/native_sync/test_publish.py b/tests/integrational/native_sync/test_publish.py index 342977a9..8aa6dd48 100644 --- a/tests/integrational/native_sync/test_publish.py +++ b/tests/integrational/native_sync/test_publish.py @@ -58,7 +58,7 @@ def test_publish_object_get(self): self.fail(e) @pn_vcr.use_cassette('tests/integrational/fixtures/native_sync/publish/publish_bool_get.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) def test_publish_bool_get(self): try: env = PubNub(pnconf).publish() \ diff --git a/tests/integrational/tornado/test_channel_groups.py b/tests/integrational/tornado/test_channel_groups.py index 2be0c8fd..31244544 100644 --- a/tests/integrational/tornado/test_channel_groups.py +++ b/tests/integrational/tornado/test_channel_groups.py @@ -16,7 +16,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/groups/add_remove_single_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @tornado.testing.gen_test def test_add_remove_single_channel(self): ch = "channel-groups-tornado-ch" @@ -54,7 +54,7 @@ def test_add_remove_single_channel(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/groups/add_remove_multiple_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @tornado.testing.gen_test def test_add_remove_multiple_channels(self): ch1 = "channel-groups-tornado-ch1" @@ -94,7 +94,7 @@ def test_add_remove_multiple_channels(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/groups/add_channel_remove_group.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test def test_add_channel_remove_group(self): ch = "channel-groups-tornado-ch" diff --git a/tests/integrational/tornado/test_heartbeat.py b/tests/integrational/tornado/test_heartbeat.py index f7e22353..630db880 100644 --- a/tests/integrational/tornado/test_heartbeat.py +++ b/tests/integrational/tornado/test_heartbeat.py @@ -34,7 +34,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/heartbeat/timeout.yaml', - filter_query_parameters=['uuid'], + filter_query_parameters=['uuid', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'string_list_in_path', 'query'], match_on_kwargs={ 'string_list_in_path': { diff --git a/tests/integrational/tornado/test_here_now.py b/tests/integrational/tornado/test_here_now.py index 6e05ebaa..1f607e5d 100644 --- a/tests/integrational/tornado/test_here_now.py +++ b/tests/integrational/tornado/test_here_now.py @@ -21,7 +21,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/here_now/single.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=15) def test_here_now_single_channel(self): ch = 'test-here-now-channel' @@ -48,7 +48,7 @@ def test_here_now_single_channel(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/here_now/multiple.yaml', - filter_query_parameters=['uuid', 'tt', 'tr']) + filter_query_parameters=['uuid', 'tt', 'tr', 'pnsdk']) @tornado.testing.gen_test(timeout=120) def test_here_now_multiple_channels(self): ch1 = 'test-here-now-channel1' @@ -83,7 +83,7 @@ def test_here_now_multiple_channels(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/here_now/global.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=15) def test_here_now_global(self): ch1 = 'test-here-now-channel1' diff --git a/tests/integrational/tornado/test_invocations.py b/tests/integrational/tornado/test_invocations.py index ec717065..18383205 100644 --- a/tests/integrational/tornado/test_invocations.py +++ b/tests/integrational/tornado/test_invocations.py @@ -37,7 +37,7 @@ def test_publish_resultx(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/invocations/result_raises.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test def test_publish_result_raises_pubnub_error(self): pubnub = PubNubTornado(corrupted_keys, custom_ioloop=self.io_loop) @@ -74,7 +74,7 @@ def test_publish_futurex(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/invocations/future_raises.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test def test_publish_future_raises(self): pubnub = PubNubTornado(corrupted_keys, custom_ioloop=self.io_loop) diff --git a/tests/integrational/tornado/test_publish.py b/tests/integrational/tornado/test_publish.py index e45e990d..cc13631d 100644 --- a/tests/integrational/tornado/test_publish.py +++ b/tests/integrational/tornado/test_publish.py @@ -84,7 +84,7 @@ def assert_client_side_error(self, pub, expected_err_msg): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/mixed_via_get.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) def test_publish_mixed_via_get(self): self.assert_success_publish_get("hi") self.assert_success_publish_get(5) @@ -93,14 +93,14 @@ def test_publish_mixed_via_get(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_get.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']) def test_publish_object_via_get(self): self.assert_success_publish_get({"name": "Alex", "online": True}) @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/mixed_via_post.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'scheme', 'host', 'port', 'path', 'query']) def test_publish_mixed_via_post(self): self.assert_success_publish_post("hi") @@ -110,14 +110,14 @@ def test_publish_mixed_via_post(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_post.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['host', 'method', 'path', 'query', 'object_in_body']) def test_publish_object_via_post(self): self.assert_success_publish_post({"name": "Alex", "online": True}) @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/mixed_via_get_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) def test_publish_mixed_via_get_encrypted(self): self.assert_success_publish_get_encrypted("hi") self.assert_success_publish_get_encrypted(5) @@ -126,7 +126,7 @@ def test_publish_mixed_via_get_encrypted(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_get_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['host', 'method', 'query', 'object_in_path'], match_on_kwargs={'object_in_path': { 'decrypter': gen_decrypt_func('testKey')}}) @@ -135,7 +135,7 @@ def test_publish_object_via_get_encrypted(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/mixed_via_post_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'path', 'query', 'body']) def test_publish_mixed_via_post_encrypted(self): self.assert_success_publish_post_encrypted("hi") @@ -145,7 +145,7 @@ def test_publish_mixed_via_post_encrypted(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/object_via_post_encrypted.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'path', 'query', 'object_in_body'], match_on_kwargs={'object_in_body': { 'decrypter': gen_decrypt_func('testKey')}}) @@ -203,7 +203,7 @@ def assert_server_side_error_yield(self, pub, expected_err_msg): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/invalid_key.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) def test_error_invalid_key(self): conf = PNConfiguration() conf.publish_key = "fake" @@ -216,7 +216,7 @@ def test_error_invalid_key(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/not_permitted.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) def test_error_not_permitted_403(self): my_pnconf = pnconf_pam_copy() my_pnconf.secret_key = None @@ -229,7 +229,7 @@ def test_error_not_permitted_403(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/meta_object.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['host', 'method', 'path', 'meta_object_in_query']) def test_publish_with_meta(self): self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) @@ -241,7 +241,7 @@ def test_publish_with_meta(self): @pn_vcr.use_cassette( 'tests/integrational/fixtures/tornado/publish/do_not_store.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) def test_publish_do_not_store(self): self.pubnub = PubNubTornado(pnconf, custom_ioloop=self.io_loop) diff --git a/tests/integrational/tornado/test_state.py b/tests/integrational/tornado/test_state.py index 1b9dfb6c..87b5eabd 100644 --- a/tests/integrational/tornado/test_state.py +++ b/tests/integrational/tornado/test_state.py @@ -18,7 +18,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/state/single_channel.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'host', 'path', 'state_object_in_query']) @tornado.testing.gen_test def test_state_single_channel(self): @@ -46,7 +46,7 @@ def test_state_single_channel(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/state/multiple_channel.yaml', - filter_query_parameters=['uuid', 'seqn'], + filter_query_parameters=['uuid', 'seqn', 'pnsdk'], match_on=['method', 'host', 'path', 'state_object_in_query']) @tornado.testing.gen_test def test_multiple_channels(self): diff --git a/tests/integrational/tornado/test_subscribe.py b/tests/integrational/tornado/test_subscribe.py index 83d3d44a..8320079a 100644 --- a/tests/integrational/tornado/test_subscribe.py +++ b/tests/integrational/tornado/test_subscribe.py @@ -27,7 +27,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/sub_unsub.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=300) def test_subscribe_unsubscribe(self): ch = "subscribe-tornado-ch" @@ -56,7 +56,7 @@ def test_subscribe_unsubscribe(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/sub_pub_unsub.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=30) def test_subscribe_publish_unsubscribe(self): ch = "subscribe-tornado-ch" @@ -83,7 +83,7 @@ def test_subscribe_publish_unsubscribe(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/join_leave.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=30) def test_join_leave(self): ch = "subscribe-tornado-ch" @@ -138,7 +138,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/group_sub_unsub.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=60) def test_group_subscribe_unsubscribe(self): ch = "subscribe-unsubscribe-channel" @@ -162,7 +162,7 @@ def test_group_subscribe_unsubscribe(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/group_sub_pub_unsub.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=60) def test_group_subscribe_publish_unsubscribe(self): ch = "subscribe-unsubscribe-channel" @@ -198,7 +198,7 @@ def test_group_subscribe_publish_unsubscribe(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/group_join_leave.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=60) def test_group_join_leave(self): self.pubnub.config.uuid = "test-subscribe-messenger" @@ -258,7 +258,7 @@ def test_group_join_leave(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/subscribe/subscribe_tep_by_step.yaml', - filter_query_parameters=['uuid', 'seqn']) + filter_query_parameters=['uuid', 'seqn', 'pnsdk']) @tornado.testing.gen_test(timeout=30) def test_subscribe_step_by_step(self): ch1 = 'test-here-now-channel1' diff --git a/tests/integrational/tornado/test_where_now.py b/tests/integrational/tornado/test_where_now.py index 41e5e18a..9d08e2f5 100644 --- a/tests/integrational/tornado/test_where_now.py +++ b/tests/integrational/tornado/test_where_now.py @@ -15,7 +15,7 @@ def setUp(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/where_now/single_channel.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @tornado.testing.gen_test(timeout=15) def test_where_now_single_channel(self): ch = "where-now-tornado-ch" @@ -39,7 +39,7 @@ def test_where_now_single_channel(self): @use_cassette_and_stub_time_sleep( 'tests/integrational/fixtures/tornado/where_now/multiple_channels.yaml', - filter_query_parameters=['uuid']) + filter_query_parameters=['uuid', 'pnsdk']) @tornado.testing.gen_test(timeout=15) def test_multiple_channels(self): ch1 = "where-now-tornado-ch1" From a76585d31301cf2d30aa475a500a20e4507662db Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 3 Jan 2017 13:09:41 -0800 Subject: [PATCH 450/468] update test runner --- scripts/run-tests.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 6f9d08bd..4938e1f3 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -4,6 +4,7 @@ # binary package not from the CWD. import os +import sys from subprocess import check_call _dname = os.path.dirname @@ -11,9 +12,7 @@ REPO_ROOT = _dname(_dname(os.path.abspath(__file__))) os.chdir(os.path.join(REPO_ROOT)) -pyenv_version = os.getenv('PYENV_VERSION', 0) -travis_version = os.getenv('TRAVIS_PYTHON_VERSION', 0) -version = str(travis_version or pyenv_version) +version = str(sys.version_info.major) + "." + str( sys.version_info.minor) tcmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/manual/ ' fcmn = 'flake8 --exclude=scripts/,src/,.cache,.git,.idea,.tox,._trial_temp/' @@ -24,7 +23,6 @@ def run(command): return check_call(command, shell=True) - if version.startswith('2.6'): run( '%s--ignore=tests/integrational/tornado/ --ignore=tests/integrational/twisted/ --ignore=tests/integrational/asyncio/ --ignore=tests/integrational/python_v35/' % tcmn) # noqa: E501 From a5723d4dcbde790d709f9b6dd8e08c7780146b9b Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 3 Jan 2017 09:44:32 -0800 Subject: [PATCH 451/468] 4.0.5 --- .pubnub.yml | 15 ++++++++++++++- CHANGELOG.md | 26 ++++++++++++++++++++++++++ pubnub/pubnub_core.py | 2 +- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 111cc5c6..290d6c3f 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,21 @@ name: python -version: 4.0.4 +version: 4.0.5 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.5 + date: + changes: + - type: improvement + text: new pubnub domain + - type: improvement + text: native demo app + - type: improvement + text: fixed HTTPAdapter config + - type: improvement + text: add a new Python 3.6.0 config to travis builds + - type: improvement + text: fix blocking Ctrl+C bug - version: v4.0.4 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 9558587b..153fdbe8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,30 @@ +## [v4.0.5](https://github.com/pubnub/python/tree/v4.0.5) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.4...v4.0.5) + + +- ⭐new pubnub domain + + + +- ⭐native demo app + + + +- ⭐fixed HTTPAdapter config + + + +- ⭐add a new Python 3.6.0 config to travis builds + + + +- ⭐fix blocking Ctrl+C bug + + + ## [v4.0.4](https://github.com/pubnub/python/tree/v4.0.4) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 9a34d931..6c0fffa2 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.4" + SDK_VERSION = "4.0.5" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 From 441da4ca6fea2e503898a8a2c6a5be62c9009306 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 4 Jan 2017 09:49:14 -0800 Subject: [PATCH 452/468] patch up test runner --- scripts/run-tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/run-tests.py b/scripts/run-tests.py index 4938e1f3..cbde55e0 100755 --- a/scripts/run-tests.py +++ b/scripts/run-tests.py @@ -12,7 +12,11 @@ REPO_ROOT = _dname(_dname(os.path.abspath(__file__))) os.chdir(os.path.join(REPO_ROOT)) -version = str(sys.version_info.major) + "." + str( sys.version_info.minor) +try: + version = str(sys.version_info.major) + "." + str(sys.version_info.minor) +except: + version = str(sys.version_info[0]) + "." + str(sys.version_info[1]) + tcmn = 'py.test tests --cov-report=xml --cov=./pubnub --ignore=tests/manual/ ' fcmn = 'flake8 --exclude=scripts/,src/,.cache,.git,.idea,.tox,._trial_temp/' From a06ee60128f1733469b57cdbab44efbaef9cd1bc Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 4 Jan 2017 10:55:31 -0800 Subject: [PATCH 453/468] version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b1c716d6..de31f189 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.4', + version='4.0.5', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 01cdf420000ad9fc2524c3302e6ebb7676169ac3 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Wed, 11 Jan 2017 16:40:34 -0800 Subject: [PATCH 454/468] Fix here_now() method state exception --- pubnub/models/consumer/presence.py | 3 +- tests/integrational/asyncio/test_here_now.py | 15 +++++++ .../asyncio/here_now/multiple_channels.yaml | 41 +++++++++++++------ .../asyncio/here_now/single_channel.yaml | 29 +++++++++---- 4 files changed, 68 insertions(+), 20 deletions(-) diff --git a/pubnub/models/consumer/presence.py b/pubnub/models/consumer/presence.py index 664d47e4..5abb0d61 100644 --- a/pubnub/models/consumer/presence.py +++ b/pubnub/models/consumer/presence.py @@ -53,7 +53,8 @@ def from_json(cls, envelope, channel_names): if isinstance(user, six.string_types): occupants.append(PNHereNowOccupantsData(user, None)) else: - occupants.append(PNHereNowOccupantsData(user['uuid'], user['state'])) + state = user['state'] if 'state' in user else None + occupants.append(PNHereNowOccupantsData(user['uuid'], state)) return PNHereNowResult( total_channels=1, diff --git a/tests/integrational/asyncio/test_here_now.py b/tests/integrational/asyncio/test_here_now.py index 01702655..c2937eea 100644 --- a/tests/integrational/asyncio/test_here_now.py +++ b/tests/integrational/asyncio/test_here_now.py @@ -39,6 +39,14 @@ def test_single_channel(event_loop, sleeper=asyncio.sleep): assert channels[0].occupancy == 1 assert channels[0].occupants[0].uuid == pubnub.uuid + result = yield from pubnub.here_now() \ + .channels(ch) \ + .include_state(True) \ + .result() + + assert result.total_channels == 1 + assert result.total_occupancy == 1 + pubnub.unsubscribe().channels(ch).execute() yield from callback.wait_for_disconnect() @@ -84,6 +92,13 @@ def test_multiple_channels(event_loop, sleeper=asyncio.sleep): assert channels[1].occupancy == 1 assert channels[1].occupants[0].uuid == pubnub.uuid + result = yield from pubnub.here_now() \ + .channels([ch1, ch2]) \ + .include_state(True) \ + .result() + + assert result.total_channels == 2 + pubnub.unsubscribe().channels([ch1, ch2]).execute() yield from callback.wait_for_disconnect() diff --git a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml index e1a72806..2f286b4c 100644 --- a/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/multiple_channels.yaml @@ -2,20 +2,20 @@ interactions: - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.4] + USER-AGENT: [PubNub-Python-Asyncio/4.0.5] method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?tt=0&uuid=test-here-now-asyncio-uuid1 response: - body: {string: '{"t":{"t":"14818966089178163","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14841814610610668","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:49 GMT'} + charset="UTF-8", DATE: 'Thu, 12 Jan 2017 00:37:41 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.4 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.5 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.4] + USER-AGENT: [PubNub-Python-Asyncio/4.0.5] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1 response: @@ -25,14 +25,31 @@ interactions: 2, "total_occupancy": 2}, "service": "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, - 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '303', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 12 Jan 2017 00:37:47 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.5 - request: body: null headers: - USER-AGENT: [PubNub-Python-Asyncio/4.0.4] + USER-AGENT: [PubNub-Python-Asyncio/4.0.5] + method: GET + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?state=1&uuid=test-here-now-asyncio-uuid1 + response: + body: {string: '{"status": 200, "message": "OK", "payload": {"channels": {"test-here-now-asyncio-ch2": + {"uuids": [{"uuid": "test-here-now-asyncio-uuid1"}], "occupancy": 1}, "test-here-now-asyncio-ch1": + {"uuids": [{"uuid": "test-here-now-asyncio-uuid1"}], "occupancy": 1}}, "total_channels": + 2, "total_occupancy": 2}, "service": "Presence"}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '323', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 12 Jan 2017 00:37:47 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2?state=1&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.5 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.5] method: GET uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1 response: @@ -40,8 +57,8 @@ interactions: "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, - 16 Dec 2016 13:56:54 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 12 Jan 2017 00:37:48 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch1,test-here-now-asyncio-ch2/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.5 version: 1 diff --git a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml index ee42d22a..b93e8b58 100644 --- a/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml +++ b/tests/integrational/fixtures/asyncio/here_now/single_channel.yaml @@ -6,12 +6,12 @@ interactions: method: GET uri: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?tt=0 response: - body: {string: '{"t":{"t":"14818966032335729","r":12},"m":[]}'} + body: {string: '{"t":{"t":"14841800755720521","r":12},"m":[]}'} headers: {ACCESS-CONTROL-ALLOW-METHODS: GET, ACCESS-CONTROL-ALLOW-ORIGIN: '*', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, CONTENT-LENGTH: '45', CONTENT-TYPE: text/javascript; - charset="UTF-8", DATE: 'Fri, 16 Dec 2016 13:56:43 GMT'} + charset="UTF-8", DATE: 'Thu, 12 Jan 2017 00:14:35 GMT'} status: {code: 200, message: OK} - url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?uuid=test-here-now-asyncio-uuid1&tt=0&pnsdk=PubNub-Python-Asyncio%2F4.0.4 + url: http://ps.pndsn.com/v2/subscribe/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/test-here-now-asyncio-ch/0?tt=0&uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: @@ -23,10 +23,25 @@ interactions: ["test-here-now-asyncio-uuid1"], "occupancy": 1}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, - 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '113', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 12 Jan 2017 00:14:41 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 +- request: + body: null + headers: + USER-AGENT: [PubNub-Python-Asyncio/4.0.4] + method: GET + uri: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?state=1 + response: + body: {string: '{"status": 200, "message": "OK", "service": "Presence", "uuids": + [{"uuid": "test-here-now-asyncio-uuid1"}], "occupancy": 1}'} + headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', + ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, + CONTENT-LENGTH: '123', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 12 Jan 2017 00:14:41 GMT', SERVER: Pubnub Presence} + status: {code: 200, message: OK} + url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch?uuid=test-here-now-asyncio-uuid1&state=1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 - request: body: null headers: @@ -38,8 +53,8 @@ interactions: "Presence"}'} headers: {ACCEPT-RANGES: bytes, ACCESS-CONTROL-ALLOW-METHODS: 'OPTIONS, GET, POST', ACCESS-CONTROL-ALLOW-ORIGIN: '*', AGE: '0', CACHE-CONTROL: no-cache, CONNECTION: keep-alive, - CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Fri, - 16 Dec 2016 13:56:48 GMT', SERVER: Pubnub Presence} + CONTENT-LENGTH: '74', CONTENT-TYPE: text/javascript; charset="UTF-8", DATE: 'Thu, + 12 Jan 2017 00:14:42 GMT', SERVER: Pubnub Presence} status: {code: 200, message: OK} url: http://ps.pndsn.com/v2/presence/sub-key/sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe/channel/test-here-now-asyncio-ch/leave?uuid=test-here-now-asyncio-uuid1&pnsdk=PubNub-Python-Asyncio%2F4.0.4 version: 1 From bd997496e53f10b621edc9feaddc7cfaf4dd044b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Thu, 12 Jan 2017 02:35:12 -0800 Subject: [PATCH 455/468] Fix incorrect type assertion in PNPresenceEventResult --- pubnub/models/consumer/pubsub.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index ba30bc91..d0b4d8bd 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -47,7 +47,7 @@ def __init__(self, event, uuid, timestamp, occupancy, subscription, channel, assert isinstance(user_metadata, object) if state is not None: - assert isinstance(user_metadata, dict) + assert isinstance(state, dict) self.event = event self.uuid = uuid From 0c5d714a5b5b215c6cf9432d6d2d545d3ddcf371 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Wed, 4 Jan 2017 10:55:31 -0800 Subject: [PATCH 456/468] version bump --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b1c716d6..de31f189 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.4', + version='4.0.5', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 9c65bd4fa83db76e28c020e93672994e88adc7bd Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 12 Jan 2017 15:23:18 -0800 Subject: [PATCH 457/468] bump to 4.0.6 --- .pubnub.yml | 7 ++++++- pubnub/pubnub_core.py | 2 +- setup.py | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 290d6c3f..f974ce96 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.5 +version: 4.0.6 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.6 + date: + changes: + - type: bug + text: Fix on state object type definition. - version: v4.0.5 date: changes: diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 6c0fffa2..aaadd0f2 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.5" + SDK_VERSION = "4.0.6" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index de31f189..682578fd 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.5', + version='4.0.6', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 170ac1be426a9e0318b76d59cab6e45c7a89d8a8 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 12 Jan 2017 15:31:52 -0800 Subject: [PATCH 458/468] changelog --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 153fdbe8..882643e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +## [v4.0.6](https://github.com/pubnub/python/tree/v4.0.6) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.5...v4.0.6) + + + +- 🐛Fix on state object type definition. + + ## [v4.0.5](https://github.com/pubnub/python/tree/v4.0.5) From 369135c53486000d9fe4a5af86fa66cf0f7d8473 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 Jan 2017 14:13:17 -0800 Subject: [PATCH 459/468] Add option to use a custom crypto library instead of default Cryptodome --- pubnub/crypto.py | 105 ++++++++++++++--------------- pubnub/crypto_core.py | 11 +++ pubnub/endpoints/history.py | 6 +- pubnub/endpoints/pubsub/publish.py | 5 +- pubnub/models/consumer/history.py | 13 ++-- pubnub/pnconfiguration.py | 12 ++++ pubnub/workers.py | 7 +- tests/functional/test_stringify.py | 5 +- tests/helper.py | 7 +- tests/unit/test_crypto.py | 3 +- 10 files changed, 100 insertions(+), 74 deletions(-) create mode 100644 pubnub/crypto_core.py diff --git a/pubnub/crypto.py b/pubnub/crypto.py index 00e22e34..4c9b3def 100644 --- a/pubnub/crypto.py +++ b/pubnub/crypto.py @@ -1,15 +1,22 @@ import hashlib import json +import sys +from .crypto_core import PubNubCrypto from Cryptodome.Cipher import AES +Initial16bytes = '0123456789012345' + +if sys.version_info > (3, 0): + v = 3 +else: + v = 2 + try: from base64 import decodebytes, encodebytes except ImportError: from base64 import decodestring, encodestring -import sys - try: from hashlib import sha256 digestmod = sha256 @@ -17,56 +24,46 @@ import Cryptodome.Hash.SHA256 as digestmod sha256 = digestmod.new -if sys.version_info > (3, 0): - v = 3 -else: - v = 2 - -Initial16bytes = '0123456789012345' - - -def pad(msg, block_size=16): - padding = block_size - (len(msg) % block_size) - - if v == 3: - return msg + (chr(padding) * padding).encode('utf-8') - else: - return msg + chr(padding) * padding - - -def depad(msg): - return msg[0:-ord(msg[-1])] - - -def get_secret(key): - if v == 3: - return hashlib.sha256(key.encode("utf-8")).hexdigest() - else: - return hashlib.sha256(key).hexdigest() - - -def encrypt(key, msg): - secret = get_secret(key) - - if v == 3: - cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) - return encodebytes(cipher.encrypt(pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") - else: - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) - return encodestring(cipher.encrypt(pad(msg))).replace("\n", "") - - -def decrypt(key, msg): - secret = get_secret(key) - - if v == 3: - cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) - plain = depad((cipher.decrypt(decodebytes(msg.encode('utf-8')))).decode('utf-8')) - else: - cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) - plain = depad(cipher.decrypt(decodestring(msg))) - try: - return json.loads(plain) - except Exception: - return plain +class PubNubCryptodome(PubNubCrypto): + def encrypt(self, key, msg): + secret = self.get_secret(key) + + if v == 3: + cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) + return encodebytes(cipher.encrypt(self.pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") + else: + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + return encodestring(cipher.encrypt(self.pad(msg))).replace("\n", "") + + def decrypt(self, key, msg): + secret = self.get_secret(key) + + if v == 3: + cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) + plain = self.depad((cipher.decrypt(decodebytes(msg.encode('utf-8')))).decode('utf-8')) + else: + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + plain = self.depad(cipher.decrypt(decodestring(msg))) + + try: + return json.loads(plain) + except Exception: + return plain + + def pad(self, msg, block_size=16): + padding = block_size - (len(msg) % block_size) + + if v == 3: + return msg + (chr(padding) * padding).encode('utf-8') + else: + return msg + chr(padding) * padding + + def depad(self, msg): + return msg[0:-ord(msg[-1])] + + def get_secret(self, key): + if v == 3: + return hashlib.sha256(key.encode("utf-8")).hexdigest() + else: + return hashlib.sha256(key).hexdigest() diff --git a/pubnub/crypto_core.py b/pubnub/crypto_core.py new file mode 100644 index 00000000..d050f2cb --- /dev/null +++ b/pubnub/crypto_core.py @@ -0,0 +1,11 @@ +from abc import abstractmethod + + +class PubNubCrypto: + @abstractmethod + def encrypt(self, key, msg): + pass + + @abstractmethod + def decrypt(self, key, msg): + pass diff --git a/pubnub/endpoints/history.py b/pubnub/endpoints/history.py index 5da3d049..a42baec2 100644 --- a/pubnub/endpoints/history.py +++ b/pubnub/endpoints/history.py @@ -87,7 +87,11 @@ def validate_params(self): self.validate_channel() def create_response(self, envelope): - return PNHistoryResult.from_json(envelope, self._include_timetoken, self.pubnub.config.cipher_key) + return PNHistoryResult.from_json( + json_input=envelope, + crypto=self.pubnub.config.crypto, + include_tt_option=self._include_timetoken, + cipher=self.pubnub.config.cipher_key) def request_timeout(self): return self.pubnub.config.non_subscribe_request_timeout diff --git a/pubnub/endpoints/pubsub/publish.py b/pubnub/endpoints/pubsub/publish.py index 10fe21c4..0b74223f 100644 --- a/pubnub/endpoints/pubsub/publish.py +++ b/pubnub/endpoints/pubsub/publish.py @@ -1,5 +1,4 @@ from pubnub import utils -from pubnub import crypto as pn_crypto from pubnub.endpoints.endpoint import Endpoint from pubnub.errors import PNERR_MESSAGE_MISSING from pubnub.exceptions import PubNubException @@ -49,7 +48,7 @@ def build_data(self): if self._use_post is True: cipher = self.pubnub.config.cipher_key if cipher is not None: - return '"' + pn_crypto.encrypt(cipher, utils.write_value_as_string(self._message)) + '"' + return '"' + self.pubnub.config.crypto.encrypt(cipher, utils.write_value_as_string(self._message)) + '"' else: return utils.write_value_as_string(self._message) else: @@ -88,7 +87,7 @@ def build_path(self): stringified_message = utils.write_value_as_string(self._message) if cipher is not None: - stringified_message = '"' + pn_crypto.encrypt(cipher, stringified_message) + '"' + stringified_message = '"' + self.pubnub.config.crypto.encrypt(cipher, stringified_message) + '"' stringified_message = utils.url_encode(stringified_message) diff --git a/pubnub/models/consumer/history.py b/pubnub/models/consumer/history.py index bf6deff5..148cdb32 100644 --- a/pubnub/models/consumer/history.py +++ b/pubnub/models/consumer/history.py @@ -1,5 +1,3 @@ -from pubnub import crypto as pn_crypto - class PNHistoryResult(object): def __init__(self, messages, start_timetoken, end_timetoken): @@ -11,7 +9,7 @@ def __str__(self): return "History result for range %d..%d" % (self.start_timetoken, self.end_timetoken) @classmethod - def from_json(cls, json_input, include_tt_option=False, cipher=None): + def from_json(cls, json_input, crypto, include_tt_option=False, cipher=None): start_timetoken = json_input[1] end_timetoken = json_input[2] @@ -20,9 +18,9 @@ def from_json(cls, json_input, include_tt_option=False, cipher=None): for item in raw_items: if isinstance(item, dict) and 'timetoken' in item and 'message' in item and include_tt_option: - message = PNHistoryItemResult(item['message'], item['timetoken']) + message = PNHistoryItemResult(item['message'], crypto, item['timetoken']) else: - message = PNHistoryItemResult(item) + message = PNHistoryItemResult(item, crypto) if cipher is not None: message.decrypt(cipher) @@ -37,12 +35,13 @@ def from_json(cls, json_input, include_tt_option=False, cipher=None): class PNHistoryItemResult(object): - def __init__(self, entry, timetoken=None): + def __init__(self, entry, crypto, timetoken=None): self.timetoken = timetoken self.entry = entry + self.crypto = crypto def __str__(self): return "History item with tt: %s and content: %s" % (self.timetoken, self.entry) def decrypt(self, cipher_key): - self.entry = pn_crypto.decrypt(cipher_key, self.entry) + self.entry = self.crypto.decrypt(cipher_key, self.entry) diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 0ceb4ba9..b6020d51 100644 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -21,6 +21,7 @@ def __init__(self): self.auth_key = None self.filter_expression = None self.enable_subscribe = True + self.crypto_instance = None self.heartbeat_notification_options = PNHeartbeatNotificationOptions.FAILURES self.reconnect_policy = PNReconnectionPolicy.NONE @@ -54,6 +55,17 @@ def set_presence_timeout_with_custom_interval(self, timeout, interval): def set_presence_timeout(self, timeout): self.set_presence_timeout_with_custom_interval(timeout, (timeout / 2) - 1) + @property + def crypto(self): + if self.crypto_instance is None: + self._init_cryptodome() + + return self.crypto_instance + + def _init_cryptodome(self): + from pubnub.crypto import PubNubCryptodome + self.crypto_instance = PubNubCryptodome() + @property def port(self): return 443 if self.ssl == "https" else 80 diff --git a/pubnub/workers.py b/pubnub/workers.py index 494fdf85..9b5f0058 100644 --- a/pubnub/workers.py +++ b/pubnub/workers.py @@ -1,6 +1,5 @@ import logging -from . import crypto as pn_crypto from abc import abstractmethod from .utils import strip_right from .models.consumer.pubsub import PNPresenceEventResult, PNMessageResult @@ -10,12 +9,12 @@ class SubscribeMessageWorker(object): - def __init__(self, pubnub_instnace, listener_manager_instance, queue_instance, event): + def __init__(self, pubnub_instance, listener_manager_instance, queue_instance, event): # assert isinstance(pubnub_instnace, PubNubCore) # assert isinstance(listener_manager_instance, ListenerManager) # assert isinstance(queue_instance, utils.Queue) - self._pubnub = pubnub_instnace + self._pubnub = pubnub_instance self._listener_manager = listener_manager_instance self._queue = queue_instance self._is_running = None @@ -32,7 +31,7 @@ def _process_message(self, message_input): if self._pubnub.config.cipher_key is None: return message_input else: - return pn_crypto.decrypt(self._pubnub.config.cipher_key, message_input) + return self._pubnub.config.crypto.decrypt(self._pubnub.config.cipher_key, message_input) def _process_incoming_payload(self, message): assert isinstance(message, SubscribeMessage) diff --git a/tests/functional/test_stringify.py b/tests/functional/test_stringify.py index b06043e6..2a72d325 100644 --- a/tests/functional/test_stringify.py +++ b/tests/functional/test_stringify.py @@ -1,5 +1,6 @@ import unittest +from pubnub.crypto import PubNubCryptodome from pubnub.models.consumer.access_manager import PNAccessManagerAuditResult, PNAccessManagerGrantResult from pubnub.models.consumer.channel_group import PNChannelGroupsListResult, PNChannelGroupsAddChannelResult, \ PNChannelGroupsRemoveGroupResult, PNChannelGroupsRemoveChannelResult @@ -48,10 +49,10 @@ def test_history(self): assert str(PNHistoryResult(None, 123, 789)) == "History result for range 123..789" def test_history_item(self): - assert str(PNHistoryItemResult({'blah': 2}, 123)) == \ + assert str(PNHistoryItemResult({'blah': 2}, PubNubCryptodome(), 123)) == \ "History item with tt: 123 and content: {'blah': 2}" - assert str(PNHistoryItemResult({'blah': 2})) == \ + assert str(PNHistoryItemResult({'blah': 2}, PubNubCryptodome())) == \ "History item with tt: None and content: {'blah': 2}" def test_here_now(self): diff --git a/tests/helper.py b/tests/helper.py index dab0489c..d01f9063 100644 --- a/tests/helper.py +++ b/tests/helper.py @@ -2,10 +2,10 @@ import string import random import six -import pubnub.crypto as pn_crypto from copy import copy from pubnub import utils +from pubnub.crypto import PubNubCryptodome from pubnub.pnconfiguration import PNConfiguration try: @@ -13,6 +13,9 @@ except ImportError: from unittest.mock import patch # noqa: F401 +crypto = PubNubCryptodome() + + pub_key = "pub-c-739aa0fc-3ed5-472b-af26-aca1b333ec52" sub_key = "sub-c-33f55052-190b-11e6-bfbc-02ee2ddab7fe" @@ -97,7 +100,7 @@ def gen_string(l): def gen_decrypt_func(cipher_key): def decrypter(entry): - mr = pn_crypto.decrypt(cipher_key, entry) + mr = crypto.decrypt(cipher_key, entry) return mr return decrypter diff --git a/tests/unit/test_crypto.py b/tests/unit/test_crypto.py index cb6891a0..9fa15251 100644 --- a/tests/unit/test_crypto.py +++ b/tests/unit/test_crypto.py @@ -1,8 +1,9 @@ import unittest -from pubnub import crypto +from pubnub.crypto import PubNubCryptodome from tests.helper import gen_decrypt_func +crypto = PubNubCryptodome() todecode = 'QfD1NCBJCmt1aPPGU2cshw==' key = 'testKey' From 6cc3ab731aa1cb7ba01f0984412292fdfff3ae6b Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 Jan 2017 15:11:05 -0800 Subject: [PATCH 460/468] Fix crypto imports --- pubnub/pnconfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index b6020d51..027c1c14 100644 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -63,7 +63,7 @@ def crypto(self): return self.crypto_instance def _init_cryptodome(self): - from pubnub.crypto import PubNubCryptodome + from .crypto import PubNubCryptodome self.crypto_instance = PubNubCryptodome() @property From bf186a49a118644e053dfa5c2a8024bd708e8f96 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Tue, 24 Jan 2017 15:35:31 -0800 Subject: [PATCH 461/468] Add crypto_legacy class to use it with GAE --- examples/native_threads/custom_crypto.py | 31 +++++++++ pubnub/crypto_legacy.py | 82 ++++++++++++++++++++++++ 2 files changed, 113 insertions(+) create mode 100644 examples/native_threads/custom_crypto.py create mode 100644 pubnub/crypto_legacy.py diff --git a/examples/native_threads/custom_crypto.py b/examples/native_threads/custom_crypto.py new file mode 100644 index 00000000..c29b180f --- /dev/null +++ b/examples/native_threads/custom_crypto.py @@ -0,0 +1,31 @@ +# PubNub custom crypto library usage example +import logging +import os +import sys + +d = os.path.dirname +PUBNUB_ROOT = d(d(os.path.dirname(os.path.abspath(__file__)))) +sys.path.append(PUBNUB_ROOT) + +import pubnub + +pubnub.set_stream_logger('pubnub', logging.DEBUG, stream=sys.stdout) + +from examples import pnconf +from pubnub.pubnub import PubNub +from pubnub.crypto_legacy import PubNubCryptoLegacy + +crypto = PubNubCryptoLegacy() + +pnconf.enable_subscribe = False +pnconf.cipher_key = 'blah' +pnconf.crypto_instance = crypto +pubnub = PubNub(pnconf) + + +envelope = pubnub.publish() \ + .channel("blah") \ + .message("hey") \ + .sync() + +print(envelope.result) diff --git a/pubnub/crypto_legacy.py b/pubnub/crypto_legacy.py new file mode 100644 index 00000000..37091677 --- /dev/null +++ b/pubnub/crypto_legacy.py @@ -0,0 +1,82 @@ +import hashlib +import json +import sys + +from .crypto_core import PubNubCrypto +from Crypto.Cipher import AES + +Initial16bytes = '0123456789012345' + +if sys.version_info > (3, 0): + v = 3 +else: + v = 2 + +try: + from base64 import decodebytes, encodebytes +except ImportError: + from base64 import decodestring, encodestring + +try: + from hashlib import sha256 + digestmod = sha256 +except ImportError: + import Crypto.Hash.SHA256 as digestmod + sha256 = digestmod.new + + +class PubNubCryptoLegacy(PubNubCrypto): + """ + Provides a crypto utils using a legacy pycrypto library. + Useful for GAE standard environment, which doesn't support Cryptodome yet. + + To use it you should explicitly assign it while configuring PNConfiguration() object: + + from pubnub.crypto_legacy import PubNubCryptoLegacy + + config = PNConfiguration() + config.crypto_instance = PubNubCryptoLegacy() + pubnub = PubNub(config) + """ + + def encrypt(self, key, msg): + secret = self.get_secret(key) + + if v == 3: + cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) + return encodebytes(cipher.encrypt(self.pad(msg.encode('utf-8')))).decode('utf-8').replace("\n", "") + else: + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + return encodestring(cipher.encrypt(self.pad(msg))).replace("\n", "") + + def decrypt(self, key, msg): + secret = self.get_secret(key) + + if v == 3: + cipher = AES.new(bytes(secret[0:32], 'utf-8'), AES.MODE_CBC, bytes(Initial16bytes, 'utf-8')) + plain = self.depad((cipher.decrypt(decodebytes(msg.encode('utf-8')))).decode('utf-8')) + else: + cipher = AES.new(secret[0:32], AES.MODE_CBC, Initial16bytes) + plain = self.depad(cipher.decrypt(decodestring(msg))) + + try: + return json.loads(plain) + except Exception: + return plain + + def pad(self, msg, block_size=16): + padding = block_size - (len(msg) % block_size) + + if v == 3: + return msg + (chr(padding) * padding).encode('utf-8') + else: + return msg + chr(padding) * padding + + def depad(self, msg): + return msg[0:-ord(msg[-1])] + + def get_secret(self, key): + if v == 3: + return hashlib.sha256(key.encode("utf-8")).hexdigest() + else: + return hashlib.sha256(key).hexdigest() From 4636a793fcd9ac117a1b4725d44661add3bd442b Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 31 Jan 2017 12:13:10 -0800 Subject: [PATCH 462/468] fix up presence payloads --- pubnub/models/consumer/pubsub.py | 1 - pubnub/models/server/subscribe.py | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pubnub/models/consumer/pubsub.py b/pubnub/models/consumer/pubsub.py index d0b4d8bd..a5f911e6 100644 --- a/pubnub/models/consumer/pubsub.py +++ b/pubnub/models/consumer/pubsub.py @@ -37,7 +37,6 @@ def __init__(self, event, uuid, timestamp, occupancy, subscription, channel, timetoken, state, user_metadata=None): assert isinstance(event, six.string_types) - assert isinstance(uuid, six.string_types) assert isinstance(timestamp, six.integer_types) assert isinstance(occupancy, six.integer_types) assert isinstance(channel, six.string_types) diff --git a/pubnub/models/server/subscribe.py b/pubnub/models/server/subscribe.py index 489c8cc0..ef4295a8 100644 --- a/pubnub/models/server/subscribe.py +++ b/pubnub/models/server/subscribe.py @@ -69,7 +69,6 @@ def from_json(cls, json_input): class PresenceEnvelope: def __init__(self, action, uuid, occupancy, timestamp, data=None): assert isinstance(action, six.string_types) - assert isinstance(uuid, six.string_types) assert isinstance(occupancy, six.integer_types) assert isinstance(timestamp, six.integer_types) if data is not None: @@ -81,14 +80,22 @@ def __init__(self, action, uuid, occupancy, timestamp, data=None): self.timestamp = timestamp self.data = data + @classmethod + def extract_value(cls, json, key): + if key in json: + return json[key] + else: + return None + @classmethod def from_json_payload(cls, json): + return PresenceEnvelope( - action=json['action'], - uuid=json['uuid'], - occupancy=json['occupancy'], - timestamp=json['timestamp'], - data=json['data'] if 'data' in json else None + action=cls.extract_value(json, 'action'), + uuid=cls.extract_value(json, 'uuid'), + occupancy=cls.extract_value(json, 'occupancy'), + timestamp=cls.extract_value(json, 'timestamp'), + data=cls.extract_value(json, 'data') ) From a7ae5748fc4189a0b8addbfd3e91970005873efa Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 31 Jan 2017 14:24:50 -0800 Subject: [PATCH 463/468] set daemon thread to false --- pubnub/request_handlers/requests_handler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubnub/request_handlers/requests_handler.py b/pubnub/request_handlers/requests_handler.py index c58f6ef7..84d80818 100644 --- a/pubnub/request_handlers/requests_handler.py +++ b/pubnub/request_handlers/requests_handler.py @@ -77,7 +77,7 @@ def callback_to_invoke_in_another_thread(): target=client.run, name="EndpointThread-%s-%d" % (endpoint_name, ++RequestsRequestHandler.ENDPOINT_THREAD_COUNTER) ) - thread.setDaemon(True) + thread.setDaemon(False) thread.start() call.thread = thread From 7f661c343a841d88006b72c75982c6358c73243f Mon Sep 17 00:00:00 2001 From: Max Presman Date: Tue, 31 Jan 2017 15:00:15 -0800 Subject: [PATCH 464/468] version bump --- pubnub/pubnub_core.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index aaadd0f2..6f2b448b 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.6" + SDK_VERSION = "4.0.7" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/setup.py b/setup.py index 682578fd..f0aec36b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.6', + version='4.0.7', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com', From 7aff24ee9acb66bc81deeb83bf397fddef4a4934 Mon Sep 17 00:00:00 2001 From: Alexander Novikov Date: Sun, 5 Feb 2017 09:21:37 -0800 Subject: [PATCH 465/468] Fix pam channels and cgs double-encoding --- pubnub/endpoints/access/grant.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pubnub/endpoints/access/grant.py b/pubnub/endpoints/access/grant.py index 57a2c600..64dbff1a 100644 --- a/pubnub/endpoints/access/grant.py +++ b/pubnub/endpoints/access/grant.py @@ -63,10 +63,10 @@ def custom_params(self): params['auth'] = utils.join_items_and_encode(self._auth_keys) if len(self._channels) > 0: - params['channel'] = utils.join_items_and_encode(self._channels) + params['channel'] = utils.join_items(self._channels) if len(self._groups) > 0: - params['channel-group'] = utils.join_items_and_encode(self._groups) + params['channel-group'] = utils.join_items(self._groups) if self._ttl is not None: params['ttl'] = str(int(self._ttl)) From ea24008c22839fa7870c8d12e35153910c403bbf Mon Sep 17 00:00:00 2001 From: Max Presman Date: Sun, 5 Feb 2017 18:29:18 -0800 Subject: [PATCH 466/468] 4.0.7 changelog --- .pubnub.yml | 11 ++++++++++- CHANGELOG.md | 18 ++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.pubnub.yml b/.pubnub.yml index f974ce96..8e93a36a 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,17 @@ name: python -version: 4.0.6 +version: 4.0.7 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.7 + date: + changes: + - type: bug + text: Handle interval presence messages gracefully if they do not contain a UUID. + - type: feature + text: Support custom cryptography module when using GAE + - type: improvement + text: designate the request thread as non-daemon to keep the SDK running. - version: v4.0.6 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index 882643e3..f59a5337 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,22 @@ +## [v4.0.7](https://github.com/pubnub/python/tree/v4.0.7) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.6...v4.0.7) + + + +- 🐛Handle interval presence messages gracefully if they do not contain a UUID. + +- 🌟Support custom cryptography module when using GAE + + + + +- ⭐designate the request thread as non-daemon to keep the SDK running. + + + ## [v4.0.6](https://github.com/pubnub/python/tree/v4.0.6) From ae520670ea993960dfeb0c55f5bae9157bfc27e6 Mon Sep 17 00:00:00 2001 From: Max Presman Date: Thu, 16 Feb 2017 10:11:34 -0800 Subject: [PATCH 467/468] codacy upgrades --- .travis.yml | 2 +- requirements-dev.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index d97dbdfd..65a3c41a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,4 +13,4 @@ install: script: - python scripts/run-tests.py after_success: - - codecov + - python-codacy-coverage -r coverage.xml diff --git a/requirements-dev.txt b/requirements-dev.txt index c48dfc9f..901ba7eb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,6 +1,6 @@ pytest pytest-cov -codecov +codacy-coverage pycryptodomex pytest-benchmark twisted From 1b1ea53c549e66f8f701e08499fa608a8af5bfbf Mon Sep 17 00:00:00 2001 From: Max Presman Date: Fri, 17 Feb 2017 12:29:50 -0800 Subject: [PATCH 468/468] 4.0.8 --- .pubnub.yml | 7 ++++++- CHANGELOG.md | 10 ++++++++++ pubnub/pnconfiguration.py | 1 + pubnub/pubnub.py | 6 ++++++ pubnub/pubnub_core.py | 2 +- pubnub/structures.py | 3 +++ setup.py | 2 +- 7 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.pubnub.yml b/.pubnub.yml index 8e93a36a..a95b1f61 100644 --- a/.pubnub.yml +++ b/.pubnub.yml @@ -1,8 +1,13 @@ name: python -version: 4.0.7 +version: 4.0.8 schema: 1 scm: github.com/pubnub/python changelog: + - version: v4.0.8 + date: + changes: + - type: feature + text: Support log_verbosity in pnconfiguration to enable HTTP logging. - version: v4.0.7 date: changes: diff --git a/CHANGELOG.md b/CHANGELOG.md index f59a5337..31635311 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,14 @@ +## [v4.0.8](https://github.com/pubnub/python/tree/v4.0.8) + + + [Full Changelog](https://github.com/pubnub/python/compare/v4.0.7...v4.0.8) + +- 🌟Support log_verbosity in pnconfiguration to enable HTTP logging. + + + + ## [v4.0.7](https://github.com/pubnub/python/tree/v4.0.7) diff --git a/pubnub/pnconfiguration.py b/pubnub/pnconfiguration.py index 027c1c14..e7c2af7f 100644 --- a/pubnub/pnconfiguration.py +++ b/pubnub/pnconfiguration.py @@ -22,6 +22,7 @@ def __init__(self): self.filter_expression = None self.enable_subscribe = True self.crypto_instance = None + self.log_verbosity = False self.heartbeat_notification_options = PNHeartbeatNotificationOptions.FAILURES self.reconnect_policy = PNReconnectionPolicy.NONE diff --git a/pubnub/pubnub.py b/pubnub/pubnub.py index 17a71492..d17008f0 100644 --- a/pubnub/pubnub.py +++ b/pubnub/pubnub.py @@ -49,6 +49,9 @@ def request_sync(self, endpoint_call_options): self.merge_in_params(endpoint_call_options) + if self.config.log_verbosity: + print(endpoint_call_options) + return self._request_handler.sync_request(platform_options, endpoint_call_options) def request_async(self, endpoint_name, endpoint_call_options, callback, cancellation_event): @@ -56,6 +59,9 @@ def request_async(self, endpoint_name, endpoint_call_options, callback, cancella self.merge_in_params(endpoint_call_options) + if self.config.log_verbosity: + print(endpoint_call_options) + return self._request_handler.async_request(endpoint_name, platform_options, endpoint_call_options, callback, cancellation_event) diff --git a/pubnub/pubnub_core.py b/pubnub/pubnub_core.py index 6f2b448b..bb35e173 100644 --- a/pubnub/pubnub_core.py +++ b/pubnub/pubnub_core.py @@ -32,7 +32,7 @@ class PubNubCore: """A base class for PubNub Python API implementations""" - SDK_VERSION = "4.0.7" + SDK_VERSION = "4.0.8" SDK_NAME = "PubNub-Python" TIMESTAMP_DIVIDER = 1000 diff --git a/pubnub/structures.py b/pubnub/structures.py index 879e07e3..d0a14a08 100644 --- a/pubnub/structures.py +++ b/pubnub/structures.py @@ -55,6 +55,9 @@ def query_list(self): def query_string(self): return str('&'.join(self.query_list())) + def __str__(self): + return "path: {0}, qs: {1}".format(self.path, self.query_string) + class PlatformOptions(object): def __init__(self, headers, pn_config): diff --git a/setup.py b/setup.py index f0aec36b..a573296b 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ setup( name='pubnub', - version='4.0.7', + version='4.0.8', description='PubNub Real-time push service in the cloud', author='PubNub', author_email='support@pubnub.com',