Make tests 1.6/1.7/1.8 compatible

* Upload to 1.8 and test against latest 1.6/1.7/1.8 versions
* Disable checking of queue in packpack builds

Author: bigbes

.travis.yml

@@ -1,8 +1,5 @@
 sudo: required
 language: C
-compiler:
-    - clang
-    - gcc
 
 services:
   - docker
@@ -15,7 +12,9 @@ env:
     global:
       - PRODUCT=tarantool-queue
     matrix:
-      - TARGET=test
+      - TARGET=test VERSION=1_6
+      - TARGET=test VERSION=1_7
+      - TARGET=test VERSION=1_8
       - OS=el DIST=6
       - OS=el DIST=7
       - OS=fedora DIST=24
@@ -28,43 +27,6 @@ env:
       - 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
-    exclude:
-      - env: OS=el DIST=6
-        compiler: clang
-      - env: OS=el DIST=7
-        compiler: clang
-      - env: OS=fedora DIST=24
-        compiler: clang
-      - env: OS=fedora DIST=25
-        compiler: clang
-      - env: OS=ubuntu DIST=precise
-        compiler: clang
-      - env: OS=ubuntu DIST=trusty
-        compiler: clang
-      - env: OS=ubuntu DIST=xenial
-        compiler: clang
-      - env: OS=ubuntu DIST=yakkety
-        compiler: clang
-      - env: OS=debian DIST=wheezy
-        compiler: clang
-      - env: OS=debian DIST=jessie
-        compiler: clang
-      - env: OS=debian DIST=stretch
-        compiler: clang
-
 script:
   - git describe --long
   - |
@@ -100,6 +62,16 @@ deploy:
     on:
       branch: master
       condition: -n "${OS}" && -n "${DIST}" && -n "${PACKAGECLOUD_TOKEN}"
+  - provider: packagecloud
+    username: tarantool
+    repository: "1_8"
+    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:

rpm/tarantool-queue.spec

@@ -20,9 +20,9 @@ A collection of persistent queue implementations for Tarantool.
 %build
 %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
-%check
-make check
-
+# %check
+# make check
+#
 %define luapkgdir %{_datadir}/tarantool/queue/
 %install
 %make_install

t/020-fifottl.t

@@ -7,6 +7,8 @@ test:plan(13)
 local queue = require('queue')
 local state = require('queue.abstract.state')
 
+local qc = require('queue.compat')
+
 local tnt  = require('t.tnt')
 tnt.cfg{}
 
@@ -209,9 +211,13 @@ test:test('read_only test', function(test)
     tube:put('abc', { delay = 0.1 })
     box.cfg{ read_only = true }
     fiber.sleep(0.11)
-    local task = tube:take(0.2)
-    test:isnil(task, "check that task wasn't moved to ready state")
-    print(task)
+    if qc.check_version({1, 7}) then
+        local task = tube:take(0.2)
+        test:isnil(task, "check that task wasn't moved to ready state")
+    else
+        local stat, task = pcall(tube.take, tube, 0.2)
+        test:is(stat, false, "check that task wasn't taken")
+    end
     test:is(tube.raw.fiber:status(), 'suspended',
             "check that background fiber isn't dead")
     box.cfg{ read_only = false }

t/040-utubettl.t

@@ -8,6 +8,8 @@ test:plan(15)
 local queue = require('queue')
 local state = require('queue.abstract.state')
 
+local qc = require('queue.compat')
+
 local tnt  = require('t.tnt')
 tnt.cfg{}
 
@@ -221,9 +223,13 @@ test:test('read_only test', function(test)
     tube:put('abc', { delay = 0.1 })
     box.cfg{ read_only = true }
     fiber.sleep(0.11)
-    local task = tube:take(0.2)
-    test:isnil(task, "check that task wasn't moved to ready state")
-    print(task)
+    if qc.check_version({1, 7}) then
+        local task = tube:take(0.2)
+        test:isnil(task, "check that task wasn't moved to ready state")
+    else
+        local stat, task = pcall(tube.take, tube, 0.2)
+        test:is(stat, false, "check that task wasn't taken")
+    end
     test:is(tube.raw.fiber:status(), 'suspended',
             "check that background fiber isn't dead")
     box.cfg{ read_only = false }

t/090-grant-check.t

@@ -13,7 +13,8 @@ local netbox = require('net.box')
 local tnt = require('t.tnt')
 
 tnt.cfg{
-    listen = uri.format({ host = test_host, service = test_port })
+    listen = ('%s:%s'):format(test_host, test_port)
+    -- listen = uri.format({ host = test_host, service = test_port })
 }
 
 local qc = require('queue.compat')
@@ -86,23 +87,42 @@ test:test('check for call grants', function(test)
     test:is(a[1], 0, 'we aren\'t getting any error')
     box.session.su('admin')
 
+    local nb_connect = netbox.connect
+    if nb_connect == nil then
+        nb_connect = netbox.new
+    end
+    local con = nb_connect(
+        ('%s:%s@%s:%s'):format(test_user, test_pass, test_host, test_port)
+    )
+    --[[
     local con = netbox.connect(uri.format({
         login = test_user, password = test_pass,
         host  = test_host, service  = test_port,
     }, true))
+    ]]--
 
-    local stat, er = pcall(con.call, con, tube, 'queue.tube.test:take')
+    local stat, err = pcall(con.call, con, 'queue.tube.test:take')
     test:is(stat, false, 'we\'re getting error')
 
     -- granting call
     tube:grant('test', { call = true })
 
+    local qc_arg_unpack = function(arg)
+        if qc.check_version({1, 7}) then
+            return arg
+        end
+        return arg and arg[1]
+    end
+
     local a = con:call('queue.tube.test:take')
-    test:is(a[1], 0, 'we aren\'t getting any error')
+    test:is(qc_arg_unpack(a[1]), 0, 'we aren\'t getting any error')
     local b = con:call('queue.tube.test:take', qc.pack_args(0.1))
-    test:isnil(b, 'we aren\'t getting any error')
-    local c = con:call('queue.tube.test:ack',  qc.pack_args(a[1]))
-    test:is(a[1], 0, 'we aren\'t getting any error')
+    test:isnil(
+        qc_arg_unpack(qc_arg_unpack(b)),
+        'we aren\'t getting any error'
+    )
+    local c = con:call('queue.tube.test:ack',  qc.pack_args(qc_arg_unpack(a[1])))
+    test:is(qc_arg_unpack(a[1]), 0, 'we aren\'t getting any error')
 
     -- check grants again
     tube:grant('test', { call = true })

test.sh

@@ -1,13 +1,15 @@
 #!/bin/bash
 
-curl https://packagecloud.io/tarantool/1_6/gpgkey | sudo apt-key add -
+VERSION=${VERSION:-1_6}
+
+curl https://packagecloud.io/tarantool/${VERSION}/gpgkey | sudo apt-key add -
 release=`lsb_release -c -s`
 
 sudo apt-get install -y apt-transport-https
 
-sudo tee /etc/apt/sources.list.d/tarantool_1_6.list <<- EOF
-deb https://packagecloud.io/tarantool/1_6/ubuntu/ $release main
-deb-src https://packagecloud.io/tarantool/1_6/ubuntu/ $release main
+sudo tee /etc/apt/sources.list.d/tarantool_${VERSION}.list <<- EOF
+deb https://packagecloud.io/tarantool/${VERSION}/ubuntu/ $release main
+deb-src https://packagecloud.io/tarantool/${VERSION}/ubuntu/ $release main
 EOF
 
 sudo apt-get update > /dev/null