<NME> .travis.yml
<BEF> language: python
python:
  - 2.7

services:
  - docker

install:
  - docker build -t automatron .
  - docker run -d -p 127.0.0.1:6378:6378 --name redis redis
  - docker run -d --link redis:redis --name automatron automatron

before_script:
  - pip install -r requirements.txt
  - pip install mock
  - pip install coverage
  - pip install coveralls


script:
  - docker ps | grep -q automatron
  - python tests.py
  - coverage run tests.py


after_success:
  coveralls

<MSG> Merge branch 'develop' of https://github.com/madflojo/automatron into develop

<DFF> @@ -18,7 +18,7 @@ before_script:
 
 
 script:
-  - docker ps | grep -q automatron
+  - docker ps
   - python tests.py
   - coverage run tests.py
 

{'commit': 'diff --git a/.travis.yml b/.travis.yml\nindex d5f1d38..d04ca34 100644\n--- a/.travis.yml\n+++ b/.travis.yml\n@@ -18,7 +18,7 @@ before_script:\n \n \n script:\n-  - docker ps | grep -q automatron\n+  - docker ps\n   - python tests.py\n   - coverage run tests.py\n \n', 'commit_subject': "Merge branch 'develop' of https://github.com/madflojo/automatron into develop", 'repo_name': 'madflojo/automatron', 'committer': {'name': 'madflojo', 'email': '73675debcd8a436be48ec22211dcf44fe0df0a64@bencane.com', 'time_sec': '1464414955', 'tz_offset': '-420', 'date': {'seconds': '1464414955'}}, 'commit_tree': 'e7ff882fceb18a468479914b38f720e7f9bfee4d', 'commit_message': "Merge branch 'develop' of https://github.com/madflojo/automatron into develop\n", 'language_name': 'HTML', 'license': 'apache-2.0', 'hunks': '@@ -18,7 +18,7 @@ before_script:\n \n \n script:\n-  - docker ps | grep -q automatron\n+  - docker ps\n   - python tests.py\n   - coverage run tests.py\n \n', 'addition_count': 1, 'deletion_count': 1, 'src_file': 'a/.travis.yml', 'tgt_file': 'b/.travis.yml', 'file_extension': '.yml', 'before_file': 'language: python\npython:\n  - 2.7\n\nservices:\n  - docker\n\ninstall:\n  - docker build -t automatron .\n  - docker run -d -p 127.0.0.1:6378:6378 --name redis redis\n  - docker run -d --link redis:redis --name automatron automatron\n\nbefore_script:\n  - pip install -r requirements.txt\n  - pip install mock\n  - pip install coverage\n  - pip install coveralls\n\n\nscript:\n  - docker ps | grep -q automatron\n  - python tests.py\n  - coverage run tests.py\n\n\nafter_success:\n  coveralls\n', 'message': "Merge branch 'develop' of https://github.com/madflojo/automatron into develop\n", 'author_name': 'madflojo', 'lang': 'travis'}