diff --git a/.travis.yml b/.travis.yml index 03aa3ec..b144a19 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,15 +11,7 @@ python: - "nightly" # currently points to 3.6-dev # command to install dependencies before_install: - - sudo apt-get install build-essential - - sudo apt-get install tcl8.5 - - wget http://download.redis.io/releases/redis-2.8.3.tar.gz - - tar -xvzf redis-2.8.3.tar.gz - - cd redis-2.8.3 - - make - - sudo make install - - cd .. - # - apt-get install redis-server + - sudo apt-get install redis-server install: - "pip install -r requirements.txt" - "pip install -e ." diff --git a/pytest_gui_status/status_gui/todo.txt b/pytest_gui_status/status_gui/todo.txt index 12bd7f2..e71781c 100644 --- a/pytest_gui_status/status_gui/todo.txt +++ b/pytest_gui_status/status_gui/todo.txt @@ -1,11 +1,11 @@ Todo ------ - -1. Add gui tests -2. use logging.debug / log file for more prints -3. Allow config for tmpl, redis_arg, status_gui_arg -4. Add well-explained readme -4. Use config.pluginmanager.hasplugin('plugin_name') when needed +** use travis - install redis - how to run it ** +1. Allow config for tmpl, redis_arg, status_gui_arg +2. Add well-explained readme +3. use logging.debug / log file for more prints +4. Add gui tests +5. Use config.pluginmanager.hasplugin('plugin_name') when needed Done diff --git a/pytest_gui_status/status_plugin/plugin.py b/pytest_gui_status/status_plugin/plugin.py index d3629f5..9fad59d 100644 --- a/pytest_gui_status/status_plugin/plugin.py +++ b/pytest_gui_status/status_plugin/plugin.py @@ -14,7 +14,10 @@ if env_redis_port: else: REDIS_PORT = 5946 -command_redis_server_gen = "redis-server --port {port} --maxheap 20MB" +if os.environ["TRAVIS"] == "true": + command_redis_server_gen = "redis-server --port {port}" +else: + command_redis_server_gen = "redis-server --port {port} --maxheap 20MB" command_redis_server = command_redis_server_gen.format(port=REDIS_PORT) command_status_gui_gen = "pytest_gui_status \"{norm_dir_name}\""