You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/12/31 14:20:35 UTC

[tinkerpop] branch master updated (f0587b0 -> de0a1a6)

This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.


    from f0587b0  Updated changelog CTR
     add 6b51c54  fix for TINKERPOP-2105
     new c0d62b8  Merge branch 'pr-1023' into tp33
     new d548d42  Merged template change without regenerating package.json
     new de0a1a6  Merge branch 'tp33'

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/javascript/gremlin-javascript/package.json   |  4 ++--
 .../src/main/jython/gremlin_python/driver/client.py       |  4 ++++
 .../src/main/jython/gremlin_python/driver/connection.py   | 15 +++++++++------
 .../src/main/jython/tests/driver/test_client.py           | 13 +++++++++++++
 4 files changed, 28 insertions(+), 8 deletions(-)


[tinkerpop] 01/03: Merge branch 'pr-1023' into tp33

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c0d62b8c77d60bf0b5af4f08adb27b320819cb9a
Merge: ccd6236 6b51c54
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Dec 31 07:27:22 2018 -0500

    Merge branch 'pr-1023' into tp33

 .../src/main/jython/gremlin_python/driver/client.py       |  4 ++++
 .../src/main/jython/gremlin_python/driver/connection.py   | 15 +++++++++------
 .../src/main/jython/tests/driver/test_client.py           | 13 +++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)


[tinkerpop] 03/03: Merge branch 'tp33'

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit de0a1a6be5b42c6dd4ba5fe3d624025a241fd0ca
Merge: f0587b0 d548d42
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Dec 31 09:20:25 2018 -0500

    Merge branch 'tp33'

 .../src/main/javascript/gremlin-javascript/package.json   |  4 ++--
 .../src/main/jython/gremlin_python/driver/client.py       |  4 ++++
 .../src/main/jython/gremlin_python/driver/connection.py   | 15 +++++++++------
 .../src/main/jython/tests/driver/test_client.py           | 13 +++++++++++++
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --cc gremlin-python/src/main/jython/tests/driver/test_client.py
index dd1de47,63a486c..5761a2a
--- a/gremlin-python/src/main/jython/tests/driver/test_client.py
+++ b/gremlin-python/src/main/jython/tests/driver/test_client.py
@@@ -53,16 -49,19 +53,29 @@@ def test_client_eval_traversal(client)
      assert len(client.submit('g.V()').all().result()) == 6
  
  
 +def test_client_error(client):
 +    try:
 +        # should fire an exception
 +        client.submit('1/0').all().result()
 +        assert False
 +    except GremlinServerError as ex:
 +        assert 'exceptions' in ex.status_attributes
 +        assert 'stackTrace' in ex.status_attributes
 +
 +
+ def test_client_connection_pool_after_error(client):
+     # Overwrite fixture with pool_size=1 client
+     client = Client('ws://localhost:45940/gremlin', 'gmodern', pool_size=1)
+ 
+     try:
+         # should fire an exception
+         client.submit('1/0').all().result()
+         assert False
+     except Exception:
+         # expecting the pool size to be 1 again after query returned
+         assert client.available_pool_size == 1
+ 
+ 
  def test_client_bytecode(client):
      g = Graph().traversal()
      t = g.V()


[tinkerpop] 02/03: Merged template change without regenerating package.json

Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit d548d423ef7f52c3206e2115040d040c512a6200
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Mon Dec 31 09:19:01 2018 -0500

    Merged template change without regenerating package.json
    
    This is the generated template - CTR
---
 .../src/main/javascript/gremlin-javascript/package.json               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 18de8ce..d4a1fb6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -14,7 +14,7 @@
   ],
   "license": "Apache-2.0",
   "dependencies": {
-    "ws": "^6.1.2"
+    "ws": "^3.0.0"
   },
   "devDependencies": {
     "mocha": "~4.0.1",
@@ -40,4 +40,4 @@
   "engines": {
     "node": ">=6"
   }
-}
+}
\ No newline at end of file