Merge upstream changes

.gitignore

@@ -28,3 +28,5 @@ packaging/build/
 packaging/root/
 Vagrantfile
 .vagrant/*
+embedded/*
+.pip-cache/*

.travis.yml

@@ -1,17 +1,68 @@
+sudo: false
+
+branches:
+  only:
+    - master
+    - /^\d+\.\d+\.x$/ # release forked patches branch
+
+services:
+  - couchdb # FIXME see ci/couchdb
+
+cache:
+  bundler: true
+  directories:
+    - $HOME/.pip-cache
+    - $HOME/embedded
+
 language: python
 python:
   - "2.6"
   - "2.7"
 
+matrix:
+  fast_finish: true
+
 env:
   global:
+    - CONCURRENCY=2
     - NOSE_FILTER="not windows"
+    - INTEGRATIONS_DIR=$HOME/embedded
+    - PIP_CACHE=$HOME/.pip-cache
+    - SKIP_CLEANUP=true
+    - VOLATILE_DIR=/tmp
   matrix:
     - TRAVIS_FLAVOR=default
-    - TRAVIS_FLAVOR=cache,gearman,database,ssh
-    - TRAVIS_FLAVOR=cassandra,tomcat,jmx # JMX testing machine / need the other ones before
-    - TRAVIS_FLAVOR=elasticsearch,network,sysstat,webserver
     - TRAVIS_FLAVOR=mongo
+    - TRAVIS_FLAVOR=elasticsearch ES_VERSION=1.4.2
+    - TRAVIS_FLAVOR=elasticsearch ES_VERSION=1.3.7
+    - TRAVIS_FLAVOR=elasticsearch ES_VERSION=1.2.4
+    - TRAVIS_FLAVOR=elasticsearch ES_VERSION=1.1.2
+    - TRAVIS_FLAVOR=elasticsearch ES_VERSION=1.0.3
+    - TRAVIS_FLAVOR=elasticsearch ES_VERSION=0.90.13
+    - TRAVIS_FLAVOR=cassandra
+    - TRAVIS_FLAVOR=sysstat
+    - TRAVIS_FLAVOR=redis REDIS_VERSION="2.8"
+    - TRAVIS_FLAVOR=redis REDIS_VERSION="2.6"
+    - TRAVIS_FLAVOR=redis REDIS_VERSION="2.4"
+    - TRAVIS_FLAVOR=memcache
+    - TRAVIS_FLAVOR=postgres PG_VERSION="9.4.0"
+    - TRAVIS_FLAVOR=postgres PG_VERSION="9.3.5"
+    - TRAVIS_FLAVOR=postgres PG_VERSION="9.2.9"
+    - TRAVIS_FLAVOR=postgres PG_VERSION="9.1.14"
+    - TRAVIS_FLAVOR=postgres PG_VERSION="9.0.18"
+# FIXME: cannot enable gearman on Travis right now
+# because it needs boost
+#    - TRAVIS_FLAVOR=gearman
+    - TRAVIS_FLAVOR=tomcat # JMX testing machine / need the other ones before
+    - TRAVIS_FLAVOR=mysql
+    - TRAVIS_FLAVOR=couchdb
+    - TRAVIS_FLAVOR=snmpd
+    - TRAVIS_FLAVOR=apache
+    - TRAVIS_FLAVOR=nginx
+    - TRAVIS_FLAVOR=lighttpd
+    - TRAVIS_FLAVOR=haproxy
+    - TRAVIS_FLAVOR=ssh
+    - TRAVIS_FLAVOR=fluentd
 
 # Override travis defaults with empty jobs
 before_install: echo "OVERRIDING TRAVIS STEPS"
@@ -20,14 +71,16 @@ before_script: echo "OVERRIDING TRAVIS STEPS"
 
 script:
   - bundle install
+  - 'ls -al $HOME/embedded'
   - 'rake ci:run'
 
 after_failure:
   - echo "Logs from installation process come here / DEBUG LOGS"
   - cat /tmp/ci.log
-  - bash -c "if [[ \"$TRAVIS_FLAVOR\" =~ \"mongo\" ]]; then cat /tmp/mongo.log; fi"
-  - bash -c "if [[ \"$TRAVIS_FLAVOR\" =~ \"mongo\" ]]; then cat /data/mongod1/mongo.log; fi"
-  - bash -c "if [[ \"$TRAVIS_FLAVOR\" =~ \"mongo\" ]]; then cat /data/mongod2/mongo.log; fi"
+
+after_error:
+  - echo "Logs from installation process come here / DEBUG LOGS"
+  - cat /tmp/ci.log
 
 notifications:
   hipchat:

README.markdown

@@ -26,24 +26,31 @@ pull request.
 
 Required:
 - python 2.6 or 2.7
-- Rake
+- bundler
 
-Clone the repository
 ```
+# Clone the repository
 git clone git@github.com:DataDog/dd-agent.git
-```
 
-Crete a virtual environment and install the dependencies:
-```
+# Crete a virtual environment and install the dependencies:
 cd dd-agent
+bundle install
 rake setup_env
-````
 
-Activate the virtual environment:
-```
+# Activate the virtual environment
 source venv/bin/activate
+
+# Lint
+rake lint
+
+# Run a flavored test
+rake ci:run[apache]
 ```
 
+## Test suite
+
+More about how to write tests and run them [here](https://github.com/DataDog/dd-agent/blob/master/tests/README.md)
+
 # How to configure the Agent
 
 If you are using packages on linux, the main configuration file lives 

Rakefile

@@ -4,27 +4,37 @@
 require 'rake/clean'
 
 # Flavored Travis CI jobs
-require './ci/cache'
+require './ci/apache'
 require './ci/cassandra'
-require './ci/database'
+require './ci/couchdb'
 require './ci/default'
 require './ci/elasticsearch'
+require './ci/fluentd'
 require './ci/gearman'
-require './ci/jmx'
+require './ci/haproxy'
+require './ci/lighttpd'
+require './ci/memcache'
 require './ci/mongo'
-require './ci/network'
+require './ci/mysql'
+require './ci/nginx'
+require './ci/postgres'
+require './ci/redis'
+require './ci/snmpd'
 require './ci/sysstat'
 require './ci/ssh'
 require './ci/tomcat'
-require './ci/webserver'
 
 CLOBBER.include '**/*.pyc'
 
-desc "Run tests"
-task :test, [:attrs] do |t, args|
-  attrs = args.attrs ? "-a #{args.attrs}" : ""
-  cmd = "nosetests #{attrs}"
-  sh cmd
+# Travis-like environment for local use
+
+unless ENV['IS_TRAVIS']
+  rakefile_dir = File.dirname(__FILE__)
+  ENV['TRAVIS_BUILD_DIR'] = rakefile_dir
+  ENV['INTEGRATIONS_DIR'] = File.join(rakefile_dir, 'embedded')
+  ENV['PIP_CACHE'] = File.join(rakefile_dir, '.pip-cache')
+  ENV['VOLATILE_DIR'] = '/tmp/dd-agent-testing'
+  ENV['CONCURRENCY'] = ENV['CONCURRENCY'] || '2' 
 end
 
 desc 'Setup a development environment for the Agent'
@@ -64,7 +74,7 @@ end
 
 desc "Lint the code through pylint"
 task "lint" do
-  sh("find . -name \\*.py -type f -not -path \\*tests\\* -exec pylint --rcfile=.pylintrc --reports=n --output-format=parseable {} \\;")
+  sh %{find . -name '*.py' -type f -not -path '*venv*' | xargs --max-procs=$CONCURRENCY -n 1 pylint --rcfile=./.pylintrc}
 end
 
 desc "Run the Agent locally"
@@ -73,9 +83,9 @@ task "run" do
 end
 
 namespace :ci do
-  desc 'Run Travis CI flavored tests'
+  desc 'Run integration tests'
   task :run, :flavor  do |t, args|
-    fail "Failing because this is supposed to run on Travis" unless ENV['TRAVIS']
+    puts "Assuming you are running these tests locally" unless ENV['TRAVIS']
     flavor = args[:flavor] || ENV['TRAVIS_FLAVOR'] || 'default'
     flavors = flavor.split(',')
     flavors.each { |f| Rake::Task["ci:#{f}:execute"].invoke}