From 61f6e342c36fc8a8940ef528d9725dba988801ed Mon Sep 17 00:00:00 2001
From: Barnaby Court <bcourt@redhat.com>
Date: Wed, 8 Apr 2015 13:13:44 -0400
Subject: [PATCH] Update the .travis.yml & run-tests to maintain Pulp 2.6
 Compatibility Fix .travis.yaml to not use the --cover-min-percentage flag
 which is not available in 2.6.0 Put back the line in the .travis.yaml to load
 okaara, pymongo, and iniparse Add mongoengine to the .travis.yml file

---
 .travis.yml  | 6 ++++--
 run-tests.py | 4 ----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e7eb3556..ef6b8380 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
   - "pypy"
 before_install:
   - "pushd .."
-  - "git clone https://github.com/pulp/pulp.git --branch master"
+  - "git clone https://github.com/pulp/pulp.git --branch 2.6-release"
   - "git clone https://github.com/pulp/nectar.git"
   - "pushd nectar"
   - "git checkout python-nectar-1.1.6-1"
@@ -15,6 +15,8 @@ install:
   # This is needed to build M2Crypto
   - "sudo apt-get install swig"
   - "pip install -r test_requirements.txt"
+  # 2.5 didn't have its dependencies in its setup.py, so we need to install them too
+  - "pip install okaara pymongo iniparse mongoengine"
   - "pushd .."
   - "python nectar/setup.py develop"
   - "pulp/manage_setup_pys.sh develop"
@@ -23,5 +25,5 @@ install:
   - "sudo mkdir -p /etc/pulp"
   - "sudo touch /etc/pulp/server.conf"
 script:
-  - "./run-tests.py --enable-coverage --cover-min-percentage 100"
+  - "./run-tests.py --enable-coverage"
 after_success: coveralls
diff --git a/run-tests.py b/run-tests.py
index 5aca10ca..91bf85e0 100755
--- a/run-tests.py
+++ b/run-tests.py
@@ -5,7 +5,6 @@
 import subprocess
 import sys
 
-from pulp.devel import doc_check
 from pulp.devel.test_runner import run_tests
 
 
@@ -32,9 +31,6 @@
 if exit_code != 0:
     sys.exit(exit_code)
 
-# Ensure that all doc strings are present
-doc_check.recursive_check(PROJECT_DIR)
-
 PACKAGES = [PROJECT_DIR, 'pulp_python', ]
 
 TESTS = [