Skip to content

Commit

Permalink
tests: skip thread test on windows (seems to hang travis often)
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenbreddels committed Jul 18, 2020
1 parent ace9d37 commit df0f9fd
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ before_install:
- ./ci/01-setup-conda.sh
- export PATH="$HOME/miniconda/bin:$PATH"
- ./ci/02-create-vaex-dev-env.sh $PYTHON_VERSION
- source activate test-environment
- source activate vaex-dev
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
conda install gxx_linux-64 -y;
fi
Expand Down
3 changes: 1 addition & 2 deletions ci/01-setup-conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ bash miniconda.sh -b -p $HOME/miniconda
export PATH="$HOME/miniconda/bin:$PATH"
hash -r
# conda config --set always_yes yes --set changeps1 no
# gxx compiler needed otherwise we get an undefined symbol problem for pcre
conda install -y -q -c conda-forge mamba gxx_linux-64 -y;
conda install -y -q -c conda-forge mamba -y;
4 changes: 2 additions & 2 deletions ci/02-create-vaex-dev-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ PYTHON_VERSION=${1:-3.7}
CONDA=${2:-conda}
conda config --set always_yes yes --set changeps1 no
$CONDA update -y -q -c conda-forge $CONDA
$CONDA create -y -q -n vaex-dev python=$PYTHON_VERSION
$CONDA create -y -q -c conda-forge -n vaex-dev python=$PYTHON_VERSION
source activate vaex-dev
$CONDA install -y -q --file ci/conda-env-nightlies.yml -c arrow-nightlies -c conda-forge
$CONDA install -y -q --file ci/conda-env.yml --file ci/conda-env-notebooks.yml -c conda-forge
$CONDA install -y -q compilers --file ci/conda-env.yml --file ci/conda-env-notebooks.yml -c conda-forge
$CONDA init bash
2 changes: 1 addition & 1 deletion ci/04-run-test-suite.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -e
PYTHON_VERSION=${1:-3.7}

source activate vaex-dev
py.test tests packages/vaex-core/vaex/test/dataset.py::TestDataset
8 changes: 6 additions & 2 deletions tests/execution_test.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from common import small_buffer
import pytest
from unittest.mock import MagicMock
from concurrent.futures import ThreadPoolExecutor
import concurrent.futures
import platform

import pytest

from common import small_buffer
import vaex


Expand Down Expand Up @@ -35,6 +38,7 @@ def progress(fraction):
assert 'nested' in str(exc.value)


@pytest.mark.skipif(platform.system().lower() == 'windows', reason="hangs appveyor very often, bug?")
def test_thread_safe(df_local):
df = df_local

Expand Down

0 comments on commit df0f9fd

Please sign in to comment.