Update docs for test consolidation and remove the Makefile

CONTRIBUTING.md

@@ -72,9 +72,6 @@ See the [RPM build instructions](BUILD.md).
 
 ## Running tests
 
-This section covers how to run tests for the root of this repo, running tests 
-for the oo-install wrapper is described in [utils/README.md](utils/README.md).
-
 We use [tox](http://readthedocs.org/docs/tox/) to manage virtualenvs and run
 tests. Alternatively, tests can be run using
 [detox](https://pypi.python.org/pypi/detox/) which allows for running tests in
@@ -120,19 +117,19 @@ detox
 
 Running a particular test environment (python 2.7 flake8 tests in this case):
 ```
-tox -e py27-ansible22-flake8
+tox -e py27-flake8
 ```
 
 Running a particular test environment in a clean virtualenv (python 3.5 pylint
 tests in this case):
 ```
-tox -r -e py35-ansible22-pylint
+tox -r -e py35-pylint
 ```
 
 If you want to enter the virtualenv created by tox to do additional
 testing/debugging (py27-flake8 env in this case):
 ```
-source .tox/py27-ansible22-flake8/bin/activate
+source .tox/py27-flake8/bin/activate
 ```
 
 ## Submitting contributions

utils/Makefile

@@ -1,105 +0,0 @@
-########################################################
-
-# Makefile for OpenShift: Atomic Quick Installer
-#
-# useful targets (not all implemented yet!):
-#   make clean               -- Clean up garbage
-#   make ci ------------------- Execute CI steps (for travis or jenkins)
-
-########################################################
-
-# > VARIABLE = value
-#
-# Normal setting of a variable - values within it are recursively
-# expanded when the variable is USED, not when it's declared.
-#
-# > VARIABLE := value
-#
-# Setting of a variable with simple expansion of the values inside -
-# values within it are expanded at DECLARATION time.
-
-########################################################
-
-
-NAME := oo-install
-VENV := $(NAME)env
-SHORTNAME := ooinstall
-
-# This doesn't evaluate until it's called. The -D argument is the
-# directory of the target file ($@), kinda like `dirname`.
-ASCII2MAN = a2x -D $(dir $@) -d manpage -f manpage $<
-MANPAGES := docs/man/man1/atomic-openshift-installer.1
-# slipped into the manpage template before a2x processing
-VERSION := 1.4
-
-sdist: clean
-	python setup.py sdist
-	rm -fR $(SHORTNAME).egg-info
-
-clean:
-	@find . -type f -regex ".*\.py[co]$$" -delete
-	@find . -type f \( -name "*~" -or -name "#*" \) -delete
-	@rm -fR build dist rpm-build MANIFEST htmlcov .coverage cover ooinstall.egg-info oo-install
-	@rm -fR $(VENV)
-	@rm -fR .tox
-
-# To force a rebuild of the docs run 'touch' on any *.in file under
-# docs/man/man1/
-docs: $(MANPAGES)
-
-# Regenerate %.1.asciidoc if %.1.asciidoc.in has been modified more
-# recently than %.1.asciidoc.
-%.1.asciidoc: %.1.asciidoc.in
-	sed "s/%VERSION%/$(VERSION)/" $< > $@
-
-# Regenerate %.1 if %.1.asciidoc or VERSION has been modified more
-# recently than %.1. (Implicitly runs the %.1.asciidoc recipe)
-%.1: %.1.asciidoc
-	$(ASCII2MAN)
-
-viewcover:
-	xdg-open cover/index.html
-
-# Conditional virtualenv building strategy taken from this great post
-# by Marcel Hellkamp:
-# http://blog.bottlepy.org/2012/07/16/virtualenv-and-makefiles.html
-$(VENV): $(VENV)/bin/activate
-$(VENV)/bin/activate: test-requirements.txt
-	@echo "#############################################"
-	@echo "# Creating a virtualenv"
-	@echo "#############################################"
-	test -d $(VENV) || virtualenv $(VENV)
-	. $(VENV)/bin/activate && pip install setuptools==17.1.1
-	. $(VENV)/bin/activate && pip install -r test-requirements.txt
-	touch $(VENV)/bin/activate
-#       If there are any special things to install do it here
-#       . $(VENV)/bin/activate && INSTALL STUFF
-
-ci-unittests: $(VENV)
-	@echo "#############################################"
-	@echo "# Running Unit Tests in virtualenv"
-	@echo "#############################################"
-	. $(VENV)/bin/activate && detox -e py27-unit,py35-unit
-	@echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'"
-
-ci-pylint: $(VENV)
-	@echo "#############################################"
-	@echo "# Running PyLint Tests in virtualenv"
-	@echo "#############################################"
-	. $(VENV)/bin/activate && detox -e py27-pylint,py35-pylint
-
-ci-flake8: $(VENV)
-	@echo "#############################################"
-	@echo "# Running Flake8 Compliance Tests in virtualenv"
-	@echo "#############################################"
-	. $(VENV)/bin/activate && detox -e py27-flake8,py35-flake8
-
-ci-tox: $(VENV)
-	. $(VENV)/bin/activate && detox
-
-ci: ci-tox
-	@echo
-	@echo "##################################################################################"
-	@echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'"
-	@echo "To clean your test environment run 'make clean'"
-	@echo "Other targets you may run with 'make': 'ci-pylint', 'ci-tox', 'ci-unittests', 'ci-flake8'"

utils/README.md

@@ -1,69 +1,14 @@
 # Running Tests
 
-Run the command:
-
-    make ci
-
-to run tests and linting tools.
-
-Underneath the covers, we use [tox](http://readthedocs.org/docs/tox/) to manage virtualenvs and run
-tests. Alternatively, tests can be run using [detox](https://pypi.python.org/pypi/detox/) which allows
-for running tests in parallel.
-
-```
-pip install tox detox
-```
-
-List the test environments available:
-
-```
-tox -l
-```
-
-Run all of the tests with:
-
-```
-tox
-```
-
-Run all of the tests in parallel with detox:
-
-```
-detox
-```
-
-Run a particular test environment:
-
-```
-tox -e py27-flake8
-```
-
-Run a particular test environment in a clean virtualenv:
-
-```
-tox -r -e py35-pylint
-```
-
-If you want to enter the virtualenv created by tox to do additional
-testing/debugging:
-
-```
-source .tox/py27-flake8/bin/activate
-```
-
-You will get errors if the log files already exist and can not be
-written to by the current user (`/tmp/ansible.log` and
-`/tmp/installer.txt`). *We're working on it.*
-
+All tests can be run by running `tox`. See [running tests](..//CONTRIBUTING.md#running-tests) for more information.
 
 # Running From Source
 
 You will need to setup a **virtualenv** to run from source:
 
     $ virtualenv oo-install
-    $ source ./oo-install/bin/activate
-    $ virtualenv --relocatable ./oo-install/
-    $ python setup.py install
+    $ source oo-install/bin/activate
+    $ python setup.py develop
 
 The virtualenv `bin` directory should now be at the start of your
 `$PATH`, and `oo-install` is ready to use from your shell.