Merge pull request #29 from tarantool/fix-tests

Fix tests, update distros

Author: dedok

.travis.yml

@@ -11,32 +11,16 @@ env:
     global:
       - PRODUCT=tarantool-mqtt
     matrix:
-#      - OS=el DIST=6
       - OS=el DIST=7
-      - OS=fedora DIST=24
-      - OS=fedora DIST=25
-#      - OS=ubuntu DIST=precise
-#      - OS=ubuntu DIST=trusty
+      - OS=fedora DIST=26
+      - OS=fedora DIST=27
       - OS=ubuntu DIST=xenial
-      - OS=ubuntu DIST=yakkety
-#      - OS=debian DIST=wheezy
+      - OS=ubuntu DIST=artful
+      - OS=ubuntu DIST=bionic
+      - OS=ubuntu DIST=cosmic
       - 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
-
 script:
   - git describe --long
   - git clone https://github.com/packpack/packpack.git packpack
@@ -49,7 +33,7 @@ deploy:
   # Deploy packages to PackageCloud
   - provider: packagecloud
     username: tarantool
-    repository: "1_6"
+    repository: "1_9"
     token: ${PACKAGECLOUD_TOKEN}
     dist: ${OS}/${DIST}
     package_glob: build/*.{rpm,deb,dsc}
@@ -59,7 +43,7 @@ deploy:
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
   - provider: packagecloud
     username: tarantool
-    repository: "1_7"
+    repository: "1_10"
     token: ${PACKAGECLOUD_TOKEN}
     dist: ${OS}/${DIST}
     package_glob: build/*.{rpm,deb,dsc}
@@ -69,7 +53,7 @@ deploy:
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
   - provider: packagecloud
     username: tarantool
-    repository: "1_8"
+    repository: "2x"
     token: ${PACKAGECLOUD_TOKEN}
     dist: ${OS}/${DIST}
     package_glob: build/*.{rpm,deb,dsc}

debian/changelog

@@ -1,21 +1,24 @@
- -- Vasiliy Soshnikov <dedok.mad@gmail.com>  Sun, 8 Jul 2018 16:23:00 +0300
 tarantool-mqtt (1.4.0-1) stable; urgency=medium
   * Fixed: https://github.com/tarantool/mqtt/issues/14
   * Fixed: https://github.com/tarantool/mqtt/issues/12
   * Fixed: https://github.com/tarantool/mqtt/issues/11
   * Fixed: https://github.com/tarantool/mqtt/issues/9
 
+ -- Vasiliy Soshnikov <dedok.mad@gmail.com>  Sun, 8 Jul 2018 16:23:00 +0300
+
 tarantool-mqtt (1.2.0-1) stable; urgency=medium
   * Build issue have been fixed.
 
  -- Vasiliy Soshnikov <dedok.mad@gmail.com>  Sun, 2 Apr 2017 21:40:00 +0300
+
 tarantool-mqtt (1.1.0-1) stable; urgency=medium
 
   * RabbitMQ connection issue have been fixed.
   * Hight CPU usage issue have been fixed.
   * API errors hanling have been fixed.
 
  -- Vasiliy Soshnikov <dedok.mad@gmail.com>  Sun, 2 Apr 2017 19:24:00 +0300
+
 tarantool-mqtt (1.0.0-1) unstable; urgency=medium
 
   * Initial release.

mqtt/init.lua

@@ -492,6 +492,9 @@ mqtt_mt = {
       if (self.fiber ~= nil and self.fiber.cancel ~= nil) then
         self.fiber:cancel()
       end
+      if next(getmetatable(self.mqtt)) == nil then
+        return false, "already destroyed"
+      end
       local ok, emsg = self.mqtt:destroy()
       self = nil
       return ok, emsg

test/api.lua

@@ -41,27 +41,27 @@ local conn = mqtt.new()
 
 assert(type(conn.VERSION) == 'string')
 
-F(conn:on_connect(function(success, ret_code, message)
+F('on_connect', conn:on_connect(function(success, ret_code, message)
   if not success then
     print("can't connect msg = %s, ret_code = %d", message, ret_code)
     os.exit(1)
   end
   stat_inc('on_connect')
 end))
 
-F(conn:on_publish(function(mid)
+F('on_publish', conn:on_publish(function(mid)
   stat_inc('on_publish')
 end))
 
-F(conn:on_subscribe(function(mid, QoS)
+F('on_subscribe', conn:on_subscribe(function(mid, QoS)
   stat_inc('on_subscribe')
 end))
 
-F(conn:on_unsubscribe(function(mid)
+F('on_unsubscribe', conn:on_unsubscribe(function(mid)
   stat_inc('on_unsubscribe')
 end))
 
-F(conn:on_disconnect(
+F('on_disconnect', conn:on_disconnect(
   function(success, ret_code, message)
     if not success then
       print("can't connect msg = %s, ret_code = %d", message, ret_code)
@@ -71,7 +71,7 @@ F(conn:on_disconnect(
   end
 ))
 
-F(conn:on_message(
+F('on_message', conn:on_message(
   function(mid, topic, payload, qos, retain)
     stat_inc('on_message')
     stat[topic .. '_' .. payload] = {mid=mid}
@@ -89,24 +89,24 @@ E('reconnect', conn:reconnect())
 
 -- Here is setup for defaul Rabbitmq MQTT provider.
 -- (!) Except. login_set [[
-F(conn:tls_insecure_set(false))
+F('tls_insecure_set', conn:tls_insecure_set(false))
 F('connect', conn:connect({host="127.0.0.1", port=1883}))
-F(conn:login_set('user', 'password'))
+F('login_set', conn:login_set('user', 'password'))
 -- ]]
 
 F('reconnect', conn:reconnect())
 
-F(conn:subscribe('some/topic'))
-F(conn:will_set('some/topic', 'str', 0, false))
-F(conn:will_clear())
-F(conn:unsubscribe('some/topic'))
+F('subscribe', conn:subscribe('some/topic'))
+F('will_set', conn:will_set('some/topic', 'str', 0, false))
+F('will_clear', conn:will_clear())
+F('unsubscribe', conn:unsubscribe('some/topic'))
 
-F(conn:subscribe('channel/#'))
-F(conn:publish('channel/in_1', 'data_1', 0, false))
-F(conn:publish('channel/in_1', 'data_2', 0, false))
-F(conn:publish('channel/in_2', 'data_1', 0, false))
-F(conn:publish('channel/in_2', 'data_2', 0, false))
-F(conn:unsubscribe('channel/#'))
+F('subscribe', conn:subscribe('channel/#'))
+F('publish', conn:publish('channel/in_1', 'data_1', 0, false))
+F('publish', conn:publish('channel/in_1', 'data_2', 0, false))
+F('publish', conn:publish('channel/in_2', 'data_1', 0, false))
+F('publish', conn:publish('channel/in_2', 'data_2', 0, false))
+F('unsubscribe', conn:unsubscribe('channel/#'))
 
 -- Join
 print ("[+] Join result")
@@ -122,7 +122,7 @@ assert(stat['channel/in_2_data_2'] ~= nil)
 
 print ("[+] Done")
 
-F(conn:destroy())
-F(conn:destroy())
+F('destroy', conn:destroy())
+E('destroy', conn:destroy())
 
 os.exit(0)