Fix by comments in PR. Make refresh before request

Remove useless reconnect kwarg. Some test clean up

Fix test on win platform. Flake8 cleanup

Fix compat with init mesh builder
Fix compat Mesh class with original Connection

Fixed variables names.
Reworked strategy class.
Reorked and added tests.
Some small cleanup.

Author: denis-ignatenko

.travis.yml

@@ -10,28 +10,15 @@ env:
       - TARGET=test
       - OS=el DIST=6
       - OS=el DIST=7
-      - OS=fedora DIST=24
-      - OS=fedora DIST=25
-      - OS=ubuntu DIST=precise
+      - OS=fedora DIST=28
+      - OS=fedora DIST=29
       - OS=ubuntu DIST=trusty
       - OS=ubuntu DIST=xenial
-#      - OS=debian DIST=wheezy
+      - OS=ubuntu DIST=bionic
+      - OS=ubuntu DIST=disco
       - OS=debian DIST=jessie
       - OS=debian DIST=stretch
-
-matrix:
-    allow_failures:
-#      - env: OS=el DIST=6
-#      - env: OS=el DIST=7
-#      - env: OS=fedora DIST=24
-#      - env: OS=fedora DIST=25
-#      - env: OS=ubuntu DIST=precise
-#      - env: OS=ubuntu DIST=trusty
-#      - env: OS=ubuntu DIST=xenial
-#      - env: OS=ubuntu DIST=yakkety
-#      - env: OS=debian DIST=wheezy
-#      - env: OS=debian DIST=jessie
-#      - env: OS=debian DIST=stretch
+      - OS=debian DIST=buster
 
 script:
   - git describe --long
@@ -100,6 +87,16 @@ deploy:
     on:
       branch: master
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
+  - provider: packagecloud
+    username: tarantool
+    repository: "2_2"
+    token: ${PACKAGECLOUD_TOKEN}
+    dist: ${OS}/${DIST}
+    package_glob: build/*.{rpm,deb}
+    skip_cleanup: true
+    on:
+      branch: master
+      condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
 
 notifications:
   email:

README.rst

@@ -88,11 +88,10 @@ How to use the connector
     con = tarantool.Connection(host='localhost',
                                port=3301,
                                user='test',
-                               password='test',
-                               connect_now=True)
+                               password='test')
 
 
-    resp = con.eval('return "Hello Wrold!"')
+    resp = con.eval('return "Hello World!"')
     if resp.data[0] == "Hello World!":
         print('Ok')
 

tarantool/connection.py

@@ -126,19 +126,19 @@ def __init__(self, host, port,
         self.encoding = encoding
         self.call_16 = call_16
         self.connection_timeout = connection_timeout
-        self.authenticated = False
         if connect_now:
             self.connect()
 
     def close(self):
         '''
         Close connection to the server
         '''
+        self.connected = False
         self._socket.close()
         self._socket = None
 
     def connect_basic(self):
-        if self.host == None:
+        if self.host is None:
             self.connect_unix()
         else:
             self.connect_tcp()
@@ -201,11 +201,9 @@ def connect(self):
         :raise: `NetworkError`
         '''
         try:
-            self.authenticated = False
             self.connect_basic()
             self.handshake()
             self.load_schema()
-            self.authenticated = True
         except Exception as e:
             self.connected = False
             raise NetworkError(e)
@@ -295,13 +293,12 @@ def check():  # Check that connection is alive
                 retbytes = self._sys_recv(sock_fd, buf, 1, flag)
 
                 err = 0
-                if os.name!= 'nt':
+                if os.name != 'nt':
                     err = ctypes.get_errno()
                 else:
                     err = ctypes.get_last_error()
                     self._socket.setblocking(True)
 
-
                 WWSAEWOULDBLOCK = 10035
                 if (retbytes < 0) and (err == errno.EAGAIN or
                                        err == errno.EWOULDBLOCK or
@@ -368,38 +365,20 @@ def call(self, func_name, *args):
 
         :param func_name: stored Lua function name
         :type func_name: str
-        :param args: list of function arguments
-        :type args: list or tuple
+        :param args: function arguments
+        :type args: tuple
 
         :rtype: `Response` instance
         '''
 
+        assert isinstance(func_name, str)
+
         # This allows to use a tuple or list as an argument
         if len(args) == 1 and isinstance(args[0], (list, tuple)):
             args = args[0]
 
-        return self.call_ex(func_name, args, True)
-
-    def call_ex(self, func_name, args=[], reconnect=True):
-        '''
-        Execute CALL request. Call stored Lua function.
-
-        :param func_name: stored Lua function name
-        :type func_name: str
-        :param args: list of function arguments
-        :type args: list or tuple
-        :param reconnect: reconnect before call
-        :type reconnect: boolean
-
-        :rtype: `Response` instance
-        '''
-        assert isinstance(func_name, str)
-
         request = RequestCall(self, func_name, args, self.call_16)
-        if reconnect:
-            response = self._send_request(request)
-        else:
-            response = self._send_request_wo_reconnect(request)
+        response = self._send_request(request)
         return response
 
     def eval(self, expr, *args):
@@ -413,34 +392,14 @@ def eval(self, expr, *args):
 
         :rtype: `Response` instance
         '''
+        assert isinstance(expr, str)
 
         # This allows to use a tuple or list as an argument
         if len(args) == 1 and isinstance(args[0], (list, tuple)):
             args = args[0]
 
-        return self.eval_ex(expr, args, True)
-
-    def eval_ex(self, expr, args=[], reconnect=True):
-        '''
-        Execute EVAL request. Eval Lua expression.
-
-        :param expr: Lua expression
-        :type expr: str
-        :param args: list of function arguments
-        :type args: list or tuple
-        :param reconnect: reconnect before call
-        :type reconnect: boolean
-
-        :rtype: `Response` instance
-        '''
-        assert isinstance(expr, str)
-
         request = RequestEval(self, expr, args)
-        if reconnect:
-            response = self._send_request(request)
-        else:
-            response = self._send_request_wo_reconnect(request)
-        return response
+        return self._send_request(request)
 
     def replace(self, space_name, values):
         '''

tarantool/const.py

@@ -87,4 +87,4 @@
 # Default delay between attempts to reconnect (seconds)
 RECONNECT_DELAY = 0.1
 # Default cluster nodes list refresh interval (seconds)
-NODES_REFRESH_INTERVAL = 300
+CLUSTER_DISCOVERY_DELAY = 60