From a392289cbf6655073cdaf9dfd824d2ef12f86df1 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Sun, 1 Jul 2018 10:01:14 +0300 Subject: [PATCH] travis: run hdfs test only on Linux Signed-off-by: Ruslan Kuprieiev --- .travis.yml | 31 ++++++++++++++++--------------- tests/test_data_cloud.py | 9 +++------ tests/test_repro.py | 2 +- 3 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ae46ef4c..f1eebd229 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,21 +52,22 @@ before_install: - which python - which pip - python --version - - bash ./scripts/ci/install_hadoop.sh - - source ~/.bashrc - - hadoop fs -help - - pushd ~ - - sudo mkdir -p /home/hadoop/hadoopinfra/hdfs/namenode/ - - sudo chmod 777 /home/hadoop/hadoopinfra/hdfs/namenode/ - - sudo chmod 777 -R /usr/local/hadoop - - hdfs namenode -format - - start-dfs.sh - - jps - - hadoop fs -ls / - - hadoop fs -ls hdfs://127.0.0.1/ - - hadoop fs -mkdir hdfs://127.0.0.1/ololo - - popd - - export HADOOP_CONTAINER_IP=127.0.0.1 + - if [[ "$TRAVIS_OS_NAME" != "osx" ]]; then + bash ./scripts/ci/install_hadoop.sh; + source ~/.bashrc; + hadoop fs -help; + pushd ~; + sudo mkdir -p /home/hadoop/hadoopinfra/hdfs/namenode/; + sudo chmod 777 /home/hadoop/hadoopinfra/hdfs/namenode/; + sudo chmod 777 -R /usr/local/hadoop; + hdfs namenode -format; + start-dfs.sh; + jps; + hadoop fs -ls /; + hadoop fs -ls hdfs://127.0.0.1/; + hadoop fs -mkdir hdfs://127.0.0.1/ololo; + popd; + fi install: - bash ./scripts/ci/install.sh script: diff --git a/tests/test_data_cloud.py b/tests/test_data_cloud.py index 012143b75..a134c754b 100644 --- a/tests/test_data_cloud.py +++ b/tests/test_data_cloud.py @@ -5,6 +5,7 @@ import uuid import shutil import getpass import tempfile +import platform from dvc.main import main from dvc.config import Config, ConfigError @@ -66,11 +67,7 @@ def _should_test_ssh(): def _should_test_hdfs(): - if os.name == 'nt': - return False - if os.getenv('HADOOP_CONTAINER_IP'): - return True - return False + return platform.system() == 'Linux' def get_local_storagepath(): @@ -86,7 +83,7 @@ def get_ssh_url(): def get_hdfs_url(): - return 'hdfs://{}@{}{}'.format(getpass.getuser(), os.getenv('HADOOP_CONTAINER_IP'), get_local_storagepath()) + return 'hdfs://{}@127.0.0.1{}'.format(getpass.getuser(), get_local_storagepath()) def get_aws_storagepath(): diff --git a/tests/test_repro.py b/tests/test_repro.py index 00e3694b3..847bfb70c 100644 --- a/tests/test_repro.py +++ b/tests/test_repro.py @@ -398,7 +398,7 @@ class TestReproExternalHDFS(TestReproExternalBase): @property def bucket(self): - return getpass.getuser() + '@' + os.getenv('HADOOP_CONTAINER_IP') + return '{}@127.0.0.1'.format(getpass.getuser()) def cmd(self, i, o): return 'hadoop fs -cp {} {}'.format(i, o)