plone.api/fix_tests: change test setup

Repository: plone.api
Branch: refs/heads/fix_tests
Date: 2017-07-27T00:17:56+02:00
Author: Alexander Loechel (loechel) <[email protected]>
Commit: https://github.com/plone/plone.api/commit/a30ed21c3735859a23b2ce43aac9e7dbb628a44e

change test setup

Files changed:
M .travis.yml
M buildout.cfg
M plone-4.3.x.cfg
M plone-5.0.x.cfg
M plone-5.1.x.cfg

diff --git a/.travis.yml b/.travis.yml
index 717a83e..7195292 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,35 +1,47 @@
 language: python
-python: 2.7
 sudo: false
 cache:
+  pip: true
   directories:
-  - eggs
+    - $HOME/buildout-cache
 
-env:
-- PLONE_VERSION=4.3
-- PLONE_VERSION=5.0
 global:
   - secure: "nTXMNU2aYbCtvKD74PndF8Xm2h6IvsxPjr6vj45AxjXmaB7Wf5oGi/4b6ObV\nexBtUQkFnc+M0ThGyUznOCPi3YxcbTzsyhQYhHUtmtw/6QRyYgo4E0GLDItU\n37Ff6wpxl3NMMJTvpi6SOVUvIJUl3+cs+4bkMkS48RSFGg2rGmo="  # Coveralls.io token
 matrix:
   fast_finish: true
+  include:
+      # pyXX-plone_sunburst,pyXX-plone_barceloneta
+      - python: "2.7"
+        env: TOXENV=py27-plone-4.3
+      - python: "2.7"
+        env: TOXENV=py27-plone-5.0
+      - python: "2.7"
+        env: TOXENV=py27-plone-5.1
+      - python: "2.7"
+        env: TOXENV=isort,flake8,docs,
+
+before_install:
+    - mkdir -p $HOME/buildout-cache/{downloads,eggs,extends}
+    - mkdir $HOME/.buildout
+    - echo "[buildout]" > $HOME/.buildout/default.cfg
+    - echo "download-cache = $HOME/buildout-cache/downloads" >> $HOME/.buildout/default.cfg
+    - echo "eggs-directory = $HOME/buildout-cache/eggs" >> $HOME/.buildout/default.cfg
+    - echo "extends-cache = $HOME/buildout-cache/extends" >> $HOME/.buildout/default.cfg
+    - echo "abi-tag-eggs = true" >> $HOME/.buildout/default.cfg
 
 install:
-  - mkdir -p buildout-cache/eggs
-  - mkdir -p buildout-cache/downloads
-  - sed -ie "s#-4.3.x#-$PLONE_VERSION.x#" buildout.cfg
-  - pip install -U zc.buildout setuptools==21.0.0
-  - buildout annotate
-  - buildout
+  - travis_retry pip install -U setuptools==33.1.1 tox coveralls coverage
+
+before_script:
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
 
 script:
-  - bin/code-analysis
-  - bin/test
+    - travis_retry tox
 
 after_success:
-  - buildout -c coverage.cfg
-  - bin/coverage
-  - pip install -q coveralls
-  - coveralls
+    - coverage combine
+    - coveralls
 
 notifications:
   irc:
diff --git a/buildout.cfg b/buildout.cfg
index fe9a06a..7178951 100644
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -33,9 +33,3 @@ imports = True
 pep3101 = False
 debug-statements = True
 return-status-codes = True
-
-[versions]
-plone.api =
-
-setuptools = 33.1.1
-zc.buildout = 2.8.0
\ No newline at end of file
diff --git a/plone-4.3.x.cfg b/plone-4.3.x.cfg
index 98c10c3..0cadbac 100644
--- a/plone-4.3.x.cfg
+++ b/plone-4.3.x.cfg
@@ -3,8 +3,8 @@ extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-4.3.x.cfg
     buildout.cfg
 
-test-eggs +=
-    plone.app.contenttypes
-
 [versions]
 plone.api =
+
+setuptools = 33.1.1
+zc.buildout = 2.8.0
diff --git a/plone-5.0.x.cfg b/plone-5.0.x.cfg
index 54c048e..c4fd7db 100644
--- a/plone-5.0.x.cfg
+++ b/plone-5.0.x.cfg
@@ -3,8 +3,8 @@ extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-5.0.x.cfg
     buildout.cfg
 
-test-eggs +=
-    plone.app.contenttypes
-
 [versions]
 plone.api =
+
+setuptools = 33.1.1
+zc.buildout = 2.8.0
diff --git a/plone-5.1.x.cfg b/plone-5.1.x.cfg
index 4ad852b..0b55693 100644
--- a/plone-5.1.x.cfg
+++ b/plone-5.1.x.cfg
@@ -3,8 +3,8 @@ extends =
     https://raw.github.com/collective/buildout.plonetest/master/test-5.1.x.cfg
     buildout.cfg
 
-test-eggs +=
-    plone.app.contenttypes
-
 [versions]
 plone.api =
+
+setuptools = 33.1.1
+zc.buildout = 2.8.0



------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot