Merge pull request #192 from poissoncorp/RDBC-757

RDBC-757 Make tests on v6.0 database running

Author: poissoncorp

ravendb/documents/commands/subscriptions.py

@@ -104,9 +104,9 @@ def __init__(self, tag: str, remote_database: str, remote_task: str, verify_data
     def create_request(self, node: ServerNode) -> requests.Request:
         url = (
             f"{node.url}/info/remote-task/tcp?"
-            f"database={self._url_encode(self._remote_database)}"
-            f"&remote-task={self._url_encode(self._remote_task)}"
-            f"&tag={self._url_encode(self._tag)}"
+            f"database={self._remote_database}"
+            f"&remote-task={self._remote_task}"
+            f"&tag={self._tag}"
         )
 
         if self._verify_database:

ravendb/http/raven_command.py

@@ -110,9 +110,6 @@ def set_response_raw(self, response: requests.Response, stream: bytes) -> None:
             f"When {self.response_type} is set to Raw then please override this method to handle the response "
         )
 
-    def _url_encode(self, value: str) -> bytes:
-        return value.encode("utf-8")
-
     @staticmethod
     def ensure_is_not_null_or_string(value: str, name: str) -> None:
         if not value:

ravendb/tests/jvm_migrated_tests/client_tests/subscriptions_tests/test_basic_subscription.py

@@ -26,7 +26,7 @@
 class TestBasicSubscription(TestBase):
     def setUp(self):
         super(TestBasicSubscription, self).setUp()
-        self.reasonable_amount_of_time = 60
+        self.reasonable_amount_of_time = 10
 
     def _put_user_doc(self):
         with self.store.open_session() as session:
@@ -384,19 +384,19 @@ def test_disposing_one_subscription_should_not_affect_on_notifications_of_others
             items2 = queue.Queue()
             subscription2.run(lambda x: [items2.put(i.result) for i in x.items])
 
-            user = items1.get()
+            user = items1.get(timeout=15)
             self.assertIsNotNone(user)
             self.assertEqual("users/1", user.Id)
 
-            user = items1.get()
+            user = items1.get(timeout=15)
             self.assertIsNotNone(user)
             self.assertEqual("users/2", user.Id)
 
-            user = items2.get()
+            user = items2.get(timeout=15)
             self.assertIsNotNone(user)
             self.assertEqual("users/1", user.Id)
 
-            user = items2.get()
+            user = items2.get(timeout=15)
             self.assertIsNotNone(user)
             self.assertEqual("users/2", user.Id)
 
@@ -407,11 +407,11 @@ def test_disposing_one_subscription_should_not_affect_on_notifications_of_others
                 session.store(User(), "users/4")
                 session.save_changes()
 
-            user = items2.get()
+            user = items2.get(timeout=15)
             self.assertIsNotNone(user)
             self.assertEqual("users/3", user.Id)
 
-            user = items2.get()
+            user = items2.get(timeout=15)
             self.assertIsNotNone(user)
             self.assertEqual("users/4", user.Id)
         finally:
@@ -456,8 +456,8 @@ def test_ravenDB_3452_should_stop_pulling_docs_if_released(self):
             docs = queue.Queue()
             subscribe = subscription.run(lambda x: [docs.put(item.result) for item in x.items])
 
-            self.assertIsNotNone(docs.get())
-            self.assertIsNotNone(docs.get())
+            self.assertIsNotNone(docs.get(timeout=15))
+            self.assertIsNotNone(docs.get(timeout=15))
             self.store.subscriptions.drop_connection(key)
             try:
                 # this can exit normally or throw on drop connection