some test fixing (#200)

* some test fixing

* organization

* remove unused file

Author: Sebastian Molenda

.github/workflows/commands-handler.yml

@@ -12,7 +12,7 @@ jobs:
     name: Process command
     if: github.event.issue.pull_request && endsWith(github.repository, '-private') != true
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Check referred user
         id: user-check

.github/workflows/release.yml

@@ -10,7 +10,7 @@ jobs:
     name: Check release required
     if: github.event.pull_request.merged && endsWith(github.repository, '-private') != true
     runs-on:
-      group: Default
+      group: organization/Default
     outputs:
       release: ${{ steps.check.outputs.ready }}
     steps:
@@ -31,7 +31,7 @@ jobs:
     needs: check-release
     if: needs.check-release.outputs.release == 'true'
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/run-tests.yml

@@ -21,7 +21,7 @@ jobs:
   tests:
     name: Integration and Unit tests
     runs-on:
-      group: Default
+      group: organization/Default
     strategy:
       max-parallel: 1
       fail-fast: true
@@ -54,7 +54,7 @@ jobs:
   acceptance-tests:
     name: Acceptance tests
     runs-on:
-      group: Default
+      group: organization/Default
     timeout-minutes: 5
     steps:
       - name: Checkout project
@@ -103,7 +103,7 @@ jobs:
     name: Tests
     needs: [tests, acceptance-tests]
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Tests summary
         run: echo -e "\033[38;2;95;215;0m\033[1mAll tests successfully passed"

.github/workflows/run-validations.yml

@@ -6,7 +6,7 @@ jobs:
   lint:
     name: Lint project
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -24,7 +24,7 @@ jobs:
   pubnub-yml:
     name: "Validate .pubnub.yml"
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Checkout project
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
     name: Validations
     needs: [pubnub-yml, lint]
     runs-on:
-      group: Default
+      group: organization/Default
     steps:
       - name: Validations summary
         run: echo -e "\033[38;2;95;215;0m\033[1mAll validations passed"

pubnub/pubnub_asyncio.py

@@ -62,11 +62,12 @@ async def close_pending_tasks(self, tasks):
         await asyncio.sleep(0.1)
 
     async def create_session(self):
-        self._session = aiohttp.ClientSession(
-            loop=self.event_loop,
-            timeout=aiohttp.ClientTimeout(connect=self.config.connect_timeout),
-            connector=self._connector
-        )
+        if not self._session:
+            self._session = aiohttp.ClientSession(
+                loop=self.event_loop,
+                timeout=aiohttp.ClientTimeout(connect=self.config.connect_timeout),
+                connector=self._connector
+            )
 
     async def close_session(self):
         if self._session is not None:
@@ -76,12 +77,7 @@ async def set_connector(self, cn):
         await self._session.close()
 
         self._connector = cn
-
-        self._session = aiohttp.ClientSession(
-            loop=self.event_loop,
-            timeout=aiohttp.ClientTimeout(connect=self.config.connect_timeout),
-            connector=self._connector
-        )
+        await self.create_session()
 
     async def stop(self):
         if self._subscription_manager:

tests/integrational/asyncio/test_fire.py

@@ -1,19 +1,19 @@
 import pytest
 
-from tests.helper import pnconf_copy
+from tests.helper import pnconf_env_copy
 from tests.integrational.vcr_helper import pn_vcr
 from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope
 from pubnub.models.consumer.pubsub import PNFireResult
 from pubnub.models.consumer.common import PNStatus
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/fire_get.yaml',
+    'tests/integrational/fixtures/asyncio/publish/fire_get.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk']
 )
 @pytest.mark.asyncio
 async def test_single_channel(event_loop):
-    config = pnconf_copy()
+    config = pnconf_env_copy()
     config.enable_subscribe = False
     pn = PubNubAsyncio(config, custom_event_loop=event_loop)
     chan = 'unique_sync'

tests/integrational/asyncio/test_publish.py

@@ -9,7 +9,7 @@
 from pubnub.models.consumer.common import PNStatus
 from pubnub.models.consumer.pubsub import PNPublishResult
 from pubnub.pubnub_asyncio import PubNubAsyncio, AsyncioEnvelope, PubNubAsyncioException
-from tests.helper import pnconf_copy, pnconf_enc_copy, pnconf_pam_copy
+from tests.helper import pnconf_enc_env_copy, pnconf_pam_env_copy, pnconf_env_copy
 from tests.integrational.vcr_helper import pn_vcr
 
 pn.set_stream_logger('pubnub', logging.DEBUG)
@@ -47,12 +47,12 @@ async 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', 'pnsdk']
+    'tests/integrational/fixtures/asyncio/publish/mixed_via_get.json', serializer='pn_json',
+    filter_query_parameters=['uuid', 'seqn', 'pnsdk', 'l_pub']
 )
 @pytest.mark.asyncio
 async def test_publish_mixed_via_get(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_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)),
@@ -64,24 +64,24 @@ async def test_publish_mixed_via_get(event_loop):
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/object_via_get.yaml',
+    'tests/integrational/fixtures/asyncio/publish/object_via_get.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'],
     match_on=['method', 'scheme', 'host', 'port', 'object_in_path', 'query']
 )
 @pytest.mark.asyncio
 async def test_publish_object_via_get(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
     await asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))
 
     await pubnub.stop()
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/mixed_via_post.yaml',
-    filter_query_parameters=['uuid', 'seqn', 'pnsdk'])
+    'tests/integrational/fixtures/asyncio/publish/mixed_via_post.json', serializer='pn_json',
+    filter_query_parameters=['uuid', 'seqn', 'pnsdk', 'l_pub'])
 @pytest.mark.asyncio
 async def test_publish_mixed_via_post(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_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)),
@@ -92,24 +92,24 @@ async def test_publish_mixed_via_post(event_loop):
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/object_via_post.yaml',
+    'tests/integrational/fixtures/asyncio/publish/object_via_post.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'],
     match_on=['method', 'scheme', 'host', 'port', 'path', 'query', 'object_in_body'])
 @pytest.mark.asyncio
 async def test_publish_object_via_post(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
     await asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))
 
     await pubnub.stop()
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.yaml',
-    filter_query_parameters=['uuid', 'seqn', 'pnsdk'])
+    'tests/integrational/fixtures/asyncio/publish/mixed_via_get_encrypted.json', serializer='pn_json',
+    filter_query_parameters=['uuid', 'seqn', 'pnsdk', 'l_pub'])
 @pytest.mark.asyncio
 async def test_publish_mixed_via_get_encrypted(event_loop):
     with patch("pubnub.crypto.PubNubCryptodome.get_initialization_vector", return_value="knightsofni12345"):
-        pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop)
+        pubnub = PubNubAsyncio(pnconf_enc_env_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)),
@@ -120,28 +120,28 @@ async def test_publish_mixed_via_get_encrypted(event_loop):
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.yaml',
+    'tests/integrational/fixtures/asyncio/publish/object_via_get_encrypted.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'],
     match_on=['host', 'method', 'query']
 )
 @pytest.mark.asyncio
 async def test_publish_object_via_get_encrypted(event_loop):
     with patch("pubnub.crypto.PubNubCryptodome.get_initialization_vector", return_value="knightsofni12345"):
-        pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop)
+        pubnub = PubNubAsyncio(pnconf_enc_env_copy(), custom_event_loop=event_loop)
         await asyncio.ensure_future(assert_success_publish_get(pubnub, {"name": "Alex", "online": True}))
 
     await pubnub.stop()
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.yaml',
-    filter_query_parameters=['uuid', 'seqn', 'pnsdk'],
+    'tests/integrational/fixtures/asyncio/publish/mixed_via_post_encrypted.json', serializer='pn_json',
+    filter_query_parameters=['uuid', 'seqn', 'pnsdk', 'l_pub'],
     match_on=['method', 'path', 'query', 'body']
 )
 @pytest.mark.asyncio
 async def test_publish_mixed_via_post_encrypted(event_loop):
     with patch("pubnub.crypto.PubNubCryptodome.get_initialization_vector", return_value="knightsofni12345"):
-        pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop)
+        pubnub = PubNubAsyncio(pnconf_enc_env_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)),
@@ -153,38 +153,38 @@ async def test_publish_mixed_via_post_encrypted(event_loop):
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.yaml',
+    'tests/integrational/fixtures/asyncio/publish/object_via_post_encrypted.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'],
     match_on=['method', 'path', 'query']
 )
 @pytest.mark.asyncio
 async def test_publish_object_via_post_encrypted(event_loop):
     with patch("pubnub.crypto.PubNubCryptodome.get_initialization_vector", return_value="knightsofni12345"):
-        pubnub = PubNubAsyncio(pnconf_enc_copy(), custom_event_loop=event_loop)
+        pubnub = PubNubAsyncio(pnconf_enc_env_copy(), custom_event_loop=event_loop)
         await asyncio.ensure_future(assert_success_publish_post(pubnub, {"name": "Alex", "online": True}))
 
     await pubnub.stop()
 
 
 @pytest.mark.asyncio
 async def test_error_missing_message(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
     await assert_client_side_error(pubnub.publish().channel(ch).message(None), "Message missing")
 
     await pubnub.stop()
 
 
 @pytest.mark.asyncio
 async def test_error_missing_channel(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
     await assert_client_side_error(pubnub.publish().channel("").message("hey"), "Channel missing")
 
     await pubnub.stop()
 
 
 @pytest.mark.asyncio
 async def test_error_non_serializable(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
 
     def method():
         pass
@@ -194,23 +194,23 @@ def method():
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/meta_object.yaml',
+    'tests/integrational/fixtures/asyncio/publish/meta_object.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'],
     match_on=['host', 'method', 'path', 'meta_object_in_query'])
 @pytest.mark.asyncio
 async def test_publish_with_meta(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
 
     await assert_success_await(pubnub.publish().channel(ch).message("hey").meta({'a': 2, 'b': 'qwer'}))
     await pubnub.stop()
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/do_not_store.yaml',
+    'tests/integrational/fixtures/asyncio/publish/do_not_store.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'])
 @pytest.mark.asyncio
 async def test_publish_do_not_store(event_loop):
-    pubnub = PubNubAsyncio(pnconf_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_env_copy(), custom_event_loop=event_loop)
 
     await assert_success_await(pubnub.publish().channel(ch).message("hey").should_store(False))
     await pubnub.stop()
@@ -225,11 +225,11 @@ async def assert_server_side_error_yield(pub, expected_err_msg):
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/invalid_key.yaml',
+    'tests/integrational/fixtures/asyncio/publish/invalid_key.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'pnsdk'])
 @pytest.mark.asyncio
 async def test_error_invalid_key(event_loop):
-    pnconf = pnconf_pam_copy()
+    pnconf = pnconf_pam_env_copy()
 
     pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop)
 
@@ -238,11 +238,11 @@ async def test_error_invalid_key(event_loop):
 
 
 @pn_vcr.use_cassette(
-    'tests/integrational/fixtures/asyncio/publish/not_permitted.yaml',
+    'tests/integrational/fixtures/asyncio/publish/not_permitted.json', serializer='pn_json',
     filter_query_parameters=['uuid', 'seqn', 'signature', 'timestamp', 'pnsdk'])
 @pytest.mark.asyncio
 async def test_not_permitted(event_loop):
-    pnconf = pnconf_pam_copy()
+    pnconf = pnconf_pam_env_copy()
     pnconf.secret_key = None
     pubnub = PubNubAsyncio(pnconf, custom_event_loop=event_loop)
 
@@ -252,7 +252,7 @@ async def test_not_permitted(event_loop):
 
 @pytest.mark.asyncio
 async def test_publish_super_admin_call(event_loop):
-    pubnub = PubNubAsyncio(pnconf_pam_copy(), custom_event_loop=event_loop)
+    pubnub = PubNubAsyncio(pnconf_pam_env_copy(), custom_event_loop=event_loop)
 
     await pubnub.publish().channel(ch).message("hey").future()
     await pubnub.publish().channel("f#!|oo.bar").message("hey^&#$").should_store(True).meta({

tests/integrational/asyncio/test_subscribe.py

@@ -336,6 +336,7 @@ async def test_cg_join_leave():
     assert prs_envelope.uuid == pubnub_listener.uuid
     assert prs_envelope.channel == ch
     assert prs_envelope.subscription == gr
+    await asyncio.sleep(2)
 
     pubnub.add_listener(callback_messages)
     pubnub.subscribe().channel_groups(gr).execute()
@@ -349,6 +350,7 @@ async def test_cg_join_leave():
     assert prs_envelope.uuid == pubnub.uuid
     assert prs_envelope.channel == ch
     assert prs_envelope.subscription == gr
+    await asyncio.sleep(2)
 
     pubnub.unsubscribe().channel_groups(gr).execute()
 
@@ -363,6 +365,7 @@ async def test_cg_join_leave():
     assert prs_envelope.subscription == gr
 
     pubnub_listener.unsubscribe().channel_groups(gr).execute()
+    await asyncio.sleep(2)
 
     # with EE you don't have to wait for disconnect
     if isinstance(pubnub._subscription_manager, AsyncioSubscriptionManager):