Skip to content

Commit 1dceecc

Browse files
slavakirichenkoylobankov
authored andcommitted
ci: update test matrix
Update test matrix of test-run, fix crashed test on Tarantool 2.10 at call.test.py. Resolves #363
1 parent 1a9d38a commit 1dceecc

File tree

3 files changed

+10
-21
lines changed

3 files changed

+10
-21
lines changed

.github/workflows/test.yml

+7-19
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
python-version: ['2.7', '3.5', '3.6', '3.7', '3.8', '3.9', '3.10']
17-
tarantool-version: [2.6, 2.7]
16+
python-version: ['3.7', '3.8', '3.9', '3.10']
17+
tarantool-version: ['2.8', '2.10']
1818

1919
steps:
2020
- uses: actions/checkout@v3
21-
- name: update git submodules
22-
run: git submodule update --init --recursive
21+
with:
22+
fetch-depth: 1
23+
submodules: recursive
2324
- name: set up Tarantool ${{ matrix.tarantool-version }}
2425
uses: tarantool/setup-tarantool@v2
2526
with:
@@ -35,19 +36,6 @@ jobs:
3536
sudo apt update -y
3637
sudo apt-get -y install lua5.1 luarocks
3738
sudo luarocks install luacheck
38-
- name: set default pip to pip3
39-
run: |
40-
sudo rm -f /usr/local/bin/pip
41-
sudo ln -s /usr/bin/pip3 /usr/local/bin/pip
42-
- name: set default python and pip to v2.7
43-
if: ${{ matrix.python-version }} == 2.7
44-
run: |
45-
curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
46-
sudo python2 get-pip.py
47-
sudo rm -f /usr/bin/python
48-
sudo ln -s /usr/bin/python2 /usr/bin/python
49-
sudo rm -f /usr/local/bin/pip
50-
sudo ln -s /usr/local/bin/pip2 /usr/local/bin/pip
5139
- name: setup python dependencies
5240
run: |
5341
pip install -r requirements.txt
@@ -64,12 +52,12 @@ jobs:
6452
run: |
6553
make test_integration
6654
- name: code coverage
67-
if: ${{ matrix.python-version == '3.8' && matrix.tarantool-version == '2.7' }}
55+
if: ${{ matrix.python-version == '3.8' && matrix.tarantool-version == '2.10' }}
6856
run: |
6957
pip install coveralls==3.*
7058
make coverage
7159
- name: upload coverage data to coveralls.io
72-
if: ${{ matrix.python-version == '3.8' && matrix.tarantool-version == '2.7' }}
60+
if: ${{ matrix.python-version == '3.8' && matrix.tarantool-version == '2.10' }}
7361
run: coveralls --service=github
7462
env:
7563
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

test/test-tarantool/call.result

+1-2
Original file line numberDiff line numberDiff line change
@@ -249,8 +249,7 @@ call myinsert (3, 'old', 2)
249249
- [3, 'old', 2]
250250
space:update({3}, {{'=', 1, 4}, {'=', 2, 'new'}})
251251
---
252-
- error: Attempt to modify a tuple field which is part of index 'primary' in space
253-
'tweedledum'
252+
- error: Attempt to modify a tuple field in space
254253
...
255254
space:insert(space:get{3}:update{{'=', 1, 4}, {'=', 2, 'new'}}) space:delete{3}
256255
---

test/test-tarantool/call.test.py

+2
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ def call(name, *args):
125125
call("space:delete", 2)
126126
call("space:delete", 2)
127127
call("myinsert", 3, "old", 2)
128+
sys.stdout.push_filter("Attempt to modify a tuple field.*in space.*", "Attempt to modify a tuple field in space")
129+
sys.stdout.push_filter("\s+'tweedledum'", "")
128130
admin("space:update({3}, {{'=', 1, 4}, {'=', 2, 'new'}})")
129131
admin("space:insert(space:get{3}:update{{'=', 1, 4}, {'=', 2, 'new'}}) space:delete{3}")
130132
call("space:get", 4)

0 commit comments

Comments
 (0)