Commit 210387c0 authored by nimrod's avatar nimrod
Browse files

Merge branch 'feature/tox_env'

parents 6fb81b36 f9fba47c

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ __pycache__ 
.vagrant/

*.log

*.retry

.tox

.travis.yml

+11 −13
Original line number Diff line number Diff line
@@ -8,14 +8,15 @@ env: 
    global:

        - VBOX_MEMORY=2048

    matrix:

        - platform: openbsd60

        - &openbsd59 platform=openbsd59

        - platform: xenial

        - platform: trusty

        - platform: precise

        - &stretch platform=stretch

        - &jessie platform=jessie

        - platform: wheezy

        - TOXENV=pre-commit

        - TOXENV=openbsd60

        - &openbsd59 TOXENV=openbsd59

        - TOXENV=xenial

        - TOXENV=trusty

        - TOXENV=precise

        - &stretch TOXENV=stretch

        - &jessie TOXENV=jessie

        - TOXENV=wheezy

matrix:

    fast_finish: True

    allow_failures:
@@ -33,13 +34,10 @@ install: 
  - sudo apt-get install -y linux-headers-$(uname -r) virtualbox

  - wget https://releases.hashicorp.com/vagrant/1.9.1/vagrant_1.9.1_x86_64.deb

  - sudo dpkg -i vagrant_1.9.1_x86_64.deb

  - pip install -r tests/requirements.txt | cat

  - ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

  - molecule dependency

  - pip install tox-travis | cat



script:

  - pre-commit run --all-files

  - travis_wait 45 molecule test --platform $platform

  - travis_wait 45 tox



notifications:

  webhooks: https://galaxy.ansible.com/api/v1/notifications/

README.rst

+3 −15
Original line number Diff line number Diff line
@@ -31,21 +31,9 @@ See :code:`tests/playbook.yml`. 
Testing

-------



Testing requires Python 2.7, Vagrant and Virtualbox. Install the Python

dependencies, dependent roles and roles required for testing:



.. code:: shell



    pip install -r tests/requirements.txt

    ansible-galaxy install git+file://$(pwd),$(git rev-parse --abbrev-ref HEAD) -p .molecule/roles

    molecule dependency



To run the full test suite:



.. code:: shell



    pre-commit run --all-files

    molecule test --platform all

Testing requires Python 2.7, Tox, Vagrant and Virtualbox. To test simply run

:code:`tox`. `Pre-commit <http://pre-commit.com/>`_ is also setup for this

project.



License

-------

molecule.yml

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ ansible: 
  diff: True

  config_file: ../ansible.cfg



molecule:

  ignore_paths:

  - .tox



dependency:

  name: galaxy

  requirements_file: tests/requirements.yml

tests/requirements.txt

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ ansible==2.3.0.0 
testinfra==1.5.5

molecule==1.23.2

ansible-lint==3.4.12

pre-commit==0.13.6

python-vagrant==0.5.14

netaddr==0.7.19

passlib==1.7.1