Skip to content
This repository has been archived by the owner on Feb 21, 2023. It is now read-only.

Commit

Permalink
.travis.yml update; conftest win32 fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
popravich committed Jan 13, 2017
1 parent a6e1c76 commit 9bc4754
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 deletions.
20 changes: 9 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,24 @@ addons:
- aspell-en

language: python
python:
- "3.3"
- "3.4"
- "3.5"
- "3.6"

env:
global:
- REDIS_TAGS="2.6.17 2.8.22 3.0.7 3.2.6 4.0-rc2" CERT_DIR=/tmp/certs INSTALL_DIR=$HOME/redis TEST_ARGS=-q
- REDIS_TAGS="2.6.17 2.8.22 3.0.7 3.2.6 4.0-rc2" CERT_DIR=/tmp/certs INSTALL_DIR=$HOME/redis TASKS="ci-tests flake examples"

matrix:
include:
- python: "3.3"
env: TASKS="flake examples"
- python: "3.4"
env: TASKS="flake examples"
- python: "3.5"
env: TASKS="flake examples spelling"
- python: "3.6"
env: TASKS="flake examples"
env: TASKS="spelling"
- python: "3.6"
env: TEST_ARGS="-q --uvloop"
env: TEST_ARGS="--uvloop"
allow_failures:
- env: TEST_ARGS="-q --uvloop"
- env: TEST_ARGS="--uvloop"

cache: pip
# directories:
Expand All @@ -53,7 +52,6 @@ before_script:
- make -j certificate ci-build-redis

script:
- make ci-test
- make $TASKS

after_script:
Expand Down
11 changes: 7 additions & 4 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import ssl
import time
import logging
import tempfile

from collections import namedtuple

Expand Down Expand Up @@ -243,13 +244,15 @@ def maker(name, config_lines=None, *, slaveof=None):
else:
unixsocket = '/tmp/aioredis.{}.sock'.format(port)
dumpfile = 'dump-{}.rdb'.format(port)
tmp_files = ['/tmp/{}'.format(dumpfile)]
data_dir = tempfile.gettempdir()
dumpfile_path = os.path.join(data_dir, dumpfile)
tmp_files = [dumpfile_path]
if config_lines:
config = '/tmp/aioredis.{}.conf'.format(port)
config = os.path.join(data_dir, 'aioredis.{}.conf'.format(port))
with config_writer(config) as write:
write('daemonize no')
write('save ""')
write('dir /tmp')
write('dir ', data_dir)
write('dbfilename', dumpfile)
write('port', port)
if unixsocket:
Expand All @@ -266,7 +269,7 @@ def maker(name, config_lines=None, *, slaveof=None):
else:
args = ['--daemonize', 'no',
'--save', '""',
'--dir', '/tmp',
'--dir', data_dir,
'--dbfilename', dumpfile,
'--port', str(port),
]
Expand Down

0 comments on commit 9bc4754

Please sign in to comment.