Skip to content

Commit

Permalink
test: use Python 3
Browse files Browse the repository at this point in the history
Python 2 support is EOL [1] and we should support to run our python
tests using Python 3.x. test-run used as test-runner for memcached
already supports Python 3, see [2].

Patch enable running tests using Python 3 on CI and removes
test/var/memcached symlink.

1. https://www.python.org/doc/sunset-python-2/
2. tarantool/test-run#20

Closes #82
  • Loading branch information
ligurio committed Jan 17, 2022
1 parent 7ba5432 commit 074b9c3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ jobs:

- run: cmake .

- name: Setup Python 2 for tests
- name: Setup Python 3 for tests
uses: actions/setup-python@v2
with:
python-version: 2.7
python-version: 3.7

- name: Install test requirements
run: pip install -r test-run/requirements.txt
Expand Down
7 changes: 3 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ Memcached protocol 'wrapper' for Tarantool.

* Tarantol 1.6.8+ with header files (tarantool && tarantool-dev packages).
* Cyrus SASL library (with header files)
* Python >= 2.7, <3 with next packages (for testing only):
- PyYAML
- msgpack-python
- six==1.9.0
* Python >= 3.7 with next packages (for testing only):
- PyYAML 5+
- gevent 21+

### Installation

Expand Down
2 changes: 1 addition & 1 deletion test-run
Submodule test-run updated 72 files
+14 −0 .coveragerc
+2 −0 .flake8
+70 −0 .github/workflows/test.yml
+1 −0 .gitignore
+6 −0 .gitmodules
+32 −0 .luacheckrc
+19 −0 .tarantoolctl
+33 −0 Makefile
+114 −47 README.md
+82 −36 dispatcher.py
+0 −2 lib/Makefile
+26 −4 lib/__init__.py
+20 −14 lib/admin_connection.py
+127 −18 lib/app_server.py
+15 −18 lib/box_connection.py
+1 −0 lib/checks
+95 −46 lib/colorer.py
+7 −7 lib/connpool.py
+3 −0 lib/error.py
+26 −8 lib/inspector.py
+1 −0 lib/luatest
+133 −0 lib/luatest_server.py
+201 −62 lib/options.py
+121 −55 lib/preprocessor.py
+38 −22 lib/pytap13.py
+182 −0 lib/sampler.py
+62 −2 lib/server.py
+25 −10 lib/server_mixins.py
+0 −7 lib/singleton.py
+1 −1 lib/tarantool-python
+13 −10 lib/tarantool_connection.py
+480 −171 lib/tarantool_server.py
+88 −49 lib/test.py
+102 −21 lib/test_suite.py
+25 −10 lib/unittest_server.py
+230 −20 lib/utils.py
+80 −24 lib/worker.py
+0 −0 lib/yapps/__init__.py
+0 −442 lib/yapps/runtime.py
+222 −31 listeners.py
+0 −224 pretest_clean.lua
+3 −0 requirements-test.txt
+2 −5 requirements.txt
+119 −30 test-run.py
+19 −0 test/instances/default.lua
+44 −0 test/luatest_helpers.lua
+141 −0 test/luatest_helpers/server.lua
+19 −0 test/test-app/cfg.test.lua
+5 −0 test/test-app/suite.ini
+35 −0 test/test-luatest/smoke_check_test.lua
+3 −0 test/test-luatest/suite.ini
+1 −0 test/test-run.py
+12 −0 test/test-tarantool/box.lua
+592 −0 test/test-tarantool/call.result
+214 −0 test/test-tarantool/call.test.py
+15 −0 test/test-tarantool/engine.cfg
+7 −0 test/test-tarantool/iproto.result
+55 −0 test/test-tarantool/iproto.test.py
+21 −0 test/test-tarantool/replica.lua
+50 −0 test/test-tarantool/set_language.result
+18 −0 test/test-tarantool/set_language.test.sql
+35 −0 test/test-tarantool/setopt_delimeter.result
+22 −0 test/test-tarantool/setopt_delimeter.test.lua
+6 −0 test/test-tarantool/suite.ini
+43 −0 test/test-tarantool/worker_hang_when_gc_triggered_inside_colorer.result
+21 −0 test/test-tarantool/worker_hang_when_gc_triggered_inside_colorer.test.lua
+5 −0 test/test-unit/broken_unicode.result
+15 −0 test/test-unit/broken_unicode.test
+4 −0 test/test-unit/suite.ini
+ test/unittest/00000000000000000003.snap
+32 −0 test/unittest/test_lib_utils.py
+159 −17 test_run.lua
1 change: 0 additions & 1 deletion test/var/memcached

This file was deleted.

0 comments on commit 074b9c3

Please sign in to comment.