Update luatest to 0.5.4 (#1515)

Tests are updated accordingly.

Author: Steap2448

.github/workflows/backend-test.yml

@@ -15,11 +15,7 @@ env:
 
 jobs:
   misc:
-    strategy:
-      fail-fast: false
-      matrix:
-        runs-on: [ubuntu-18.04]
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -28,15 +24,15 @@ jobs:
       # Setup sphinx
       - name: Cache pip packages
         uses: actions/cache@v2
-        id: cache-misc-venv
+        id: cache-venv
         with:
           path: ./venv
-          key: cache-misc-venv-${{ matrix.runs-on }}-${{ hashFiles('rst/requirements.txt') }}-06
+          key: misc-venv-${{ hashFiles('rst/requirements.txt') }}-02
       -
         run: |
           python -m venv ./venv && . ./venv/bin/activate
           pip install -r rst/requirements.txt
-        if: steps.cache-misc-venv.outputs.cache-hit != 'true'
+        if: steps.cache-venv.outputs.cache-hit != 'true'
 
       # Setup tarantool
       - uses: tarantool/setup-tarantool@v1
@@ -46,28 +42,26 @@ jobs:
       # Setup luacheck and ldoc
       - name: Cache rocks
         uses: actions/cache@v2
-        id: cache-misc-rocks
+        id: cache-rocks
         with:
           path: .rocks/
-          key: cache-misc-rocks-${{ matrix.runs-on }}-${{ hashFiles('cartridge-scm-1.rockspec') }}
-          restore-keys: cache-misc-rocks-${{ matrix.runs-on }}
+          key: misc-rocks-${{ hashFiles('*.rockspec') }}-02
       -
-        run: tarantoolctl rocks install luacheck
-        if: steps.cache-misc-rocks.outputs.cache-hit != 'true'
-      -
-        run: tarantoolctl rocks install ldoc --server=https://tarantool.github.io/LDoc/
-        if: steps.cache-misc-rocks.outputs.cache-hit != 'true'
+        run: |
+          tarantoolctl rocks install luacheck
+          tarantoolctl rocks install ldoc --server=https://tarantool.github.io/LDoc/
+        if: steps.cache-rocks.outputs.cache-hit != 'true'
 
       # Setup graphql cli
       - name: Cache npm
         uses: actions/cache@v2
-        id: cache-misc-npm
+        id: cache-npm
         with:
           path: node_modules
-          key: cache-misc-npm-01
+          key: npm-02
       -
         run: npm install [email protected]
-        if: steps.cache-misc-npm.outputs.cache-hit != 'true'
+        if: steps.cache-npm.outputs.cache-hit != 'true'
 
       # Run tests
       - run: .rocks/bin/luacheck .
@@ -88,9 +82,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ubuntu-18.04]
-        tarantool: ['1.10']
-    runs-on: ${{ matrix.runs-on }}
+        tarantool: ['1.10', '2.7', '2.8', '2.9']
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/setup-python@v2
       - uses: actions/checkout@v2
@@ -109,22 +102,21 @@ jobs:
       # Setup luatest
       - name: Cache rocks
         uses: actions/cache@v2
-        id: cache-luatest-rocks
+        id: cache-rocks
         with:
           path: .rocks/
-          key: cache-luatest-rocks-${{ matrix.runs-on }}-${{ hashFiles('cartridge-scm-1.rockspec') }}
-          restore-keys: cache-luatest-rocks-${{ matrix.runs-on }}
+          key: test-rocks-${{ hashFiles('*.rockspec') }}-02
       -
-        run: tarantoolctl rocks install luatest 0.5.2
-        if: steps.cache-luatest-rocks.outputs.cache-hit != 'true'
+        run: tarantoolctl rocks install luatest 0.5.4
+        if: steps.cache-rocks.outputs.cache-hit != 'true'
 
       # Setup pytest
       - name: Cache pytest
         uses: actions/cache@v2
         id: cache-pytest
         with:
           path: ./pytest-venv
-          key: cache-pytest-venv-${{ matrix.runs-on }}-${{ hashFiles('test/integration/requirements.txt') }}-06
+          key: test-venv-${{ hashFiles('test/integration/requirements.txt') }}-02
       -
         run: |
           python -m venv ./pytest-venv && . ./pytest-venv/bin/activate

.github/workflows/compatibility-test.yml

@@ -16,10 +16,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ubuntu-18.04]
         tarantool: ['1.10']
         cartridge: ['1.2.0', '2.3.0', '2.4.0']
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-18.04
     env:
       CARTRIDGE_OLDER_PATH: cartridge-${{ matrix.cartridge }}
       CARTRIDGE_OLDER_VERSION: ${{ matrix.cartridge }}-1
@@ -35,7 +34,7 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{ env.CARTRIDGE_OLDER_PATH }}
-          key: cache-${{ env.CARTRIDGE_OLDER_PATH }}-${{ matrix.runs-on }}
+          key: ${{ env.CARTRIDGE_OLDER_PATH }}
       - name: Install ${{ env.CARTRIDGE_OLDER_PATH }}
         if: steps.cache-older-cartridge.outputs.cache-hit != 'true'
         run: |
@@ -47,14 +46,13 @@ jobs:
       # Setup luatest
       - name: Cache rocks
         uses: actions/cache@v2
-        id: cache-compatibility-rocks
+        id: cache-rocks
         with:
           path: .rocks/
-          key: cache-compatibility-rocks-${{ matrix.runs-on }}-${{ hashFiles('cartridge-scm-1.rockspec') }}
-          restore-keys: cache-compatibility-rocks-${{ matrix.runs-on }}
+          key: compat-rocks-${{ hashFiles('*.rockspec') }}-02
       -
-        run: tarantoolctl rocks install luatest 0.5.2
-        if: steps.cache-compatibility-rocks.outputs.cache-hit != 'true'
+        run: tarantoolctl rocks install luatest 0.5.4
+        if: steps.cache-rocks.outputs.cache-hit != 'true'
 
       - run: tarantoolctl rocks make
       - run: .rocks/bin/luatest -v -p compatibility.*

.github/workflows/frontend-test.yml

@@ -44,10 +44,9 @@ jobs:
         id: cache-rocks
         with:
           path: .rocks/
-          key: rocks-${{ hashFiles('cartridge-scm-1.rockspec') }}
-          restore-keys: rocks
+          key: webui-rocks-${{ hashFiles('*.rockspec') }}-02
       -
-        run: tarantoolctl rocks install luatest 0.5.2
+        run: tarantoolctl rocks install luatest 0.5.4
         if: steps.cache-rocks.outputs.cache-hit != 'true'
 
       ##################################################################
@@ -79,7 +78,7 @@ jobs:
           path: |
             ./node_modules
             ~/.cache/Cypress
-          key: cypress-cache-7.7.0-${{ runner.os }}-1
+          key: cypress-7.7.0-${{ runner.os }}-02
       -
         run: |
           npm install [email protected]

.github/workflows/nightly-test.yml

@@ -16,9 +16,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ubuntu-18.04]
         tarantool: ['1.10', '2.7', '2.8', '2.9']
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-18.04
     steps:
       - uses: actions/checkout@v2
       - uses: tarantool/setup-tarantool@v1
@@ -37,14 +36,13 @@ jobs:
       # Setup luatest
       - name: Cache rocks
         uses: actions/cache@v2
-        id: cache-luatest-rocks
+        id: cache-rocks
         with:
           path: .rocks/
-          key: cache-luatest-rocks-${{ matrix.runs-on }}-${{ hashFiles('cartridge-scm-1.rockspec') }}
-          restore-keys: cache-luatest-rocks-${{ matrix.runs-on }}
+          key: nightly-rocks-${{ hashFiles('*.rockspec') }}-02
       -
-        run: tarantoolctl rocks install luatest 0.5.2
-        if: steps.cache-luatest-rocks.outputs.cache-hit != 'true'
+        run: tarantoolctl rocks install luatest 0.5.4
+        if: steps.cache-rocks.outputs.cache-hit != 'true'
 
       - run: tarantoolctl rocks make
       - run: .rocks/bin/luatest -v

cartridge/test-helpers/server.lua

@@ -34,6 +34,7 @@ Server.constructor_checks = fun.chain(Server.constructor_checks, {
     cluster_cookie = 'string',
 
     advertise_port = 'number',
+    advertise_uri = '?string',
 
     instance_uuid = '?string',
     replicaset_uuid = '?string',
@@ -44,7 +45,7 @@ Server.constructor_checks = fun.chain(Server.constructor_checks, {
 function Server:initialize()
     self.net_box_port = self.net_box_port or self.advertise_port
     self.net_box_uri = 'localhost:' .. self.net_box_port
-    self.advertise_uri = self.net_box_uri
+    self.advertise_uri = self.advertise_uri or self.net_box_uri
     self.net_box_credentials = self.net_box_credentials or {
         user = 'admin',
         password = self.cluster_cookie,

test/integration/advertise_change_test.lua

@@ -5,9 +5,10 @@ local g = t.group()
 
 local helpers = require('test.helper')
 
-local function move(srv, uri)
-    srv.env['TARANTOOL_ADVERTISE_URI'] = uri
-    srv.net_box_uri = uri
+local function move(srv, port)
+    srv.net_box_port = nil
+    srv.advertise_uri = nil
+    srv.advertise_port = port
 end
 
 g.before_all(function()
@@ -42,18 +43,18 @@ g.before_all(function()
     g.B1 = g.cluster:server('B-1')
     g.B2 = g.cluster:server('B-2')
 
-    g.cluster.main_server.net_box:call(
+    g.cluster.main_server:call(
         'package.loaded.cartridge.failover_set_params',
         {{failover_timeout = 0}}
     )
 
     fun.foreach(function(s) s:stop() end, g.cluster.servers)
-    move(g.A1, 'localhost:13311')
-    move(g.B1, 'localhost:13312')
+    move(g.A1, 13311)
+    move(g.B1, 13312)
     fun.foreach(function(s) s:start() end, g.cluster.servers)
 
     helpers.retrying({}, function()
-        g.cluster.main_server.net_box:eval([[
+        g.cluster.main_server:eval([[
             local m = require('membership')
             assert(m.get_member('localhost:13301').status == 'dead')
             assert(m.get_member('localhost:13302').status == 'dead')
@@ -125,20 +126,22 @@ function g.test_suggestion()
     }})
 end
 
-function g.test_2pc()
-    local query = [[ mutation($servers: [EditServerInput]) {
-      cluster{ edit_topology(servers: $servers){ servers { uri } } }
+g.before_test('test_2pc', function()
+    g.query = [[ mutation($servers: [EditServerInput]) {
+        cluster{ edit_topology(servers: $servers){ servers { uri } } }
     }]]
+end)
 
+function g.test_2pc()
     g.cluster.main_server:graphql({
-        query = query,
+        query = g.query,
         variables = {servers = {
             {uuid = g.A1.instance_uuid, uri = g.A1.net_box_uri},
         }},
     })
 
     g.cluster.main_server:graphql({
-        query = query,
+        query = g.query,
         variables = {servers = {
             {uuid = g.B1.instance_uuid, uri = g.B1.net_box_uri},
         }},
@@ -154,26 +157,30 @@ function g.test_2pc()
             restart_replication = box.NULL,
         })
     end)
+end
 
+g.after_test('test_2pc', function()
     g.cluster.main_server:graphql({
-        query = query,
+        query = g.query,
         variables = {servers = {
             {uuid = g.A1.instance_uuid, uri = 'localhost:13301'},
             {uuid = g.B1.instance_uuid, uri = 'localhost:13302'},
         }},
     })
-end
-
-function g.test_failover()
-    -- Test for https://github.com/tarantool/cartridge/issues/1029
+    g.query = nil
+end)
 
-    local ok, err = g.A1.net_box:call(
+g.before_test('test_failover', function()
+    local ok, err = g.A1:call(
         'package.loaded.cartridge.failover_set_params',
         {{mode = 'eventual'}}
     )
     t.assert_equals({ok, err}, {true, nil})
+end)
 
-    local ok, err = g.B1.net_box:call(
+function g.test_failover()
+    -- Test for https://github.com/tarantool/cartridge/issues/1029
+    local ok, err = g.B1:call(
         'package.loaded.cartridge.admin_probe_server',
         {g.B2.advertise_uri}
     )
@@ -195,10 +202,12 @@ function g.test_failover()
         uuid = g.B2.instance_uuid,
         boxinfo = {general = {listen = '13303', ro = false}},
     }})
+end
 
-    local ok, err = g.A1.net_box:call(
+g.after_test('test_failover', function()
+    local ok, err = g.A1:call(
         'package.loaded.cartridge.failover_set_params',
         {{mode = 'disabled'}}
     )
     t.assert_equals({ok, err}, {true, nil})
-end
+end)

test/integration/api_join_test.lua

@@ -67,7 +67,7 @@ function g.test_join_server()
     t.assert_equals(resp['data']['probe_server'], true)
 
     local function get_peer_uuid(uri)
-        return main.net_box:eval([[
+        return main:eval([[
             local errors = require('errors')
             local pool = require('cartridge.pool')
             local conn, err = errors.assert('E', pool.connect(...))
@@ -164,7 +164,7 @@ function g.test_join_server()
     end)
 
     t.helpers.retrying({timeout = 5, delay = 0.1}, function()
-        main.net_box:eval([[
+        main:eval([[
             local cartridge = package.loaded['cartridge']
             return assert(cartridge) and assert(cartridge.is_healthy())
         ]])