summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove pytest-related dependencies from setup.pyRodolfo Carvalho2017-02-211-3/+0
| | | | | | | | | | | | | The `setup_requires` line prevents builds in internal environments without Internet access / pythonX-pytest-runner RPM installed. In fact, we're running tests with `pytest`, outside of `setup.py`, so we don't need those dependencies there. Note: we decided not to run tests through `python setup.py pytest` because pytest-runner was limited in how we can pass arguments to pytest / enable plugins. E.g., I could not get the coverage plugin working when running `python setup.py pytest`.
* Merge pull request #3424 from ashcrow/new-modules-py3Jason DeTiberus2017-02-203-4/+4
|\ | | | | Replace has_key in new modules
| * Replace has_key in new modulesSteve Milner2017-02-203-4/+4
| | | | | | | | | | | | | | The dict.has_key has been removed in Python 3. However, both Python 2 and 3 support: if needle in dict
* | Merge pull request #3419 from rhcarvalho/pytestJason DeTiberus2017-02-2016-392/+374
|\ \ | | | | | | Migrate from nose to pytest
| * | Raise the bar on coverage requirementsRodolfo Carvalho2017-02-202-2/+2
| | |
| * | Accept extra positional arguments in toxRodolfo Carvalho2017-02-202-3/+3
| | | | | | | | | | | | | | | | | | Example: tox -e py35-ansible22-unit -- --collect-only
| * | Replace nose with pytest (utils)Rodolfo Carvalho2017-02-206-17/+42
| | |
| * | Clean up utils/README.mdRodolfo Carvalho2017-02-201-25/+16
| | | | | | | | | | | | Remove old way of running tests, plus mirror edits.
| * | Replace nose with pytestRodolfo Carvalho2017-02-203-16/+1
| | |
| * | Extract assertion common to all tests as functionRodolfo Carvalho2017-02-202-56/+24
| | |
| * | Replace nose yield-style tests w/ pytest fixturesRodolfo Carvalho2017-02-203-248/+247
| | |
| * | Configure pytest to run tests and coverageRodolfo Carvalho2017-02-205-1/+42
| | |
| * | Make tests run with either nosetests or pytestRodolfo Carvalho2017-02-204-45/+43
| | | | | | | | | | | | | | | | | | | | | And remove explicit dependencies on nose, replacing with pytest. The former is the way forward, for it is a better maintained test library, and a transitive dependency of `molecule`, the test framework we're using to add integration tests to this repo (work in progress).
| * | Replace assert_equal with plain assertRodolfo Carvalho2017-02-202-28/+24
| | | | | | | | | | | | In the intention to remove the dependency on nose and use only pytest.
| * | Make usage of short_version/release consistentRodolfo Carvalho2017-02-202-27/+26
| | | | | | | | | | | | | | | This removes irrelevant differences between the two test files, making it easier to observe similarities.
| * | Reorganize tests and helper functions logicallyRodolfo Carvalho2017-02-202-129/+129
| | | | | | | | | | | | | | | | | | | | | | | | This is intented to make it easier to read tests top-down. The test methods in both files are sorted somehow logically, and in the same order in both files, to help visualizing the similarities between them with diff tools.
| * | Remove test duplicationRodolfo Carvalho2017-02-203-80/+60
| | | | | | | | | | | | | | | Consolidate tests for bad input into a single file instead of having the same code in two files.
| * | Move similar test cases togetherRodolfo Carvalho2017-02-202-64/+64
| | | | | | | | | | | | | | | And reorganize them in such a way to show that there are a bunch of duplicated tests that are exactly the same.
| * | Insert paths in the second position of sys.pathRodolfo Carvalho2017-02-202-2/+2
| | | | | | | | | | | | | | | | | | http://stackoverflow.com/a/10097543/4804690 Additionally, avoid using platform-specific '/' and '..'.
| * | Rename test for consistencyRodolfo Carvalho2017-02-201-1/+1
| | |
* | | Merge pull request #3426 from rhcarvalho/fix-code-gen-validationJason DeTiberus2017-02-202-1/+3
|\ \ \ | |/ / |/| | Fix validation of generated code
| * | Fix validation of generated codeRodolfo Carvalho2017-02-202-1/+3
|/ / | | | | | | | | Importing modules with the same name will not reload an already imported module. Explicitly reloading the module is the quickest fix.
* | Merge pull request #3407 from mtnbikenc/oc-mod-playbooksRussell Teague2017-02-202-21/+36
|\ \ | | | | | | Updating node playbooks to use oc_obj
| * | Updating node playbooks to use oc_objRussell Teague2017-02-172-21/+36
| | |
* | | Merge pull request #3340 from etsauer/scale-routerScott Dodson2017-02-201-0/+24
|\ \ \ | | | | | | | | Making router pods scale with infra nodes
| * | | Removing trailing spacesEric Sauer2017-02-131-2/+2
| | | |
| * | | Making router pods scale with infra nodesEric Sauer2017-02-101-0/+24
| | | |
* | | | Merge pull request #3425 from ingvagabund/fix-symlink-to-filters-in-spec-fileScott Dodson2017-02-201-0/+4
|\ \ \ \ | |_|_|/ |/| | | Fix symlink to filter_plugins/oo_filters.py
| * | | Fix symlink to filter_plugins/oo_filters.pyJan Chaloupka2017-02-201-0/+4
|/ / / | | | | | | | | | Bug 1423444
* | | Merge pull request #3414 from rhcarvalho/fix-missing-unit-tests-ciRodolfo Carvalho2017-02-1917-4/+9
|\ \ \ | | | | | | | | Fix missing unit tests in CI
| * | | Temporarily lower the bar for minimum coverageRodolfo Carvalho2017-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | Running tests from `roles/lib_openshift` and `roles/lib_utils` uncovers the current lower coverage. Need to fix that and raise the bar again.
| * | | Unset exec bit in tests, add missing requirementsJason DeTiberus2017-02-1916-1/+2
| | | | | | | | | | | | | | | | was: separate lib_ unit tests from other unit tests
| * | | Include missing unit tests to test runner configRodolfo Carvalho2017-02-1914-1/+5
| | | | | | | | | | | | | | | | We were not running those tests in CI, bad :(
| * | | Fix tests on Python 3Rodolfo Carvalho2017-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Unlike in Python 2: - `range` doesn't return a list. - `dict.keys` doesn't return a list.
* | | | Merge pull request #3418 from rhcarvalho/dead-codeRodolfo Carvalho2017-02-192-35/+0
|\ \ \ \ | |/ / / |/| | | Remove dead code in installer
| * | | Remove dead code in installerRodolfo Carvalho2017-02-192-35/+0
|/ / / | | | | | | | | | | | | Found using `vulture`, confirmed that code that was once used became unused in later commits after its introduction.
* | | Merge pull request #3412 from rhcarvalho/dead-codeRodolfo Carvalho2017-02-193-34/+14
|\ \ \ | | | | | | | | Remove and document how to find dead Python code
| * | | Remove dead codeRodolfo Carvalho2017-02-182-34/+0
| | | |
| * | | Document how to find dead Python codeRodolfo Carvalho2017-02-181-0/+14
| | | |
* | | | Merge pull request #3411 from kwoodson/oc_route_remove_debugKenny Woodson2017-02-182-2/+2
|\ \ \ \ | |/ / / |/| | | Fixing a bug by removing default debug output.
| * | | Fixing a bug by removing default debugKenny Woodson2017-02-172-2/+2
| | |/ | |/|
* | | Merge pull request #3402 from cgwalters/fedora-python3Scott Dodson2017-02-171-0/+12
|\ \ \ | |/ / |/| | facts/main: Require Python 3 for Fedora, Python 2 everywhere else
| * | facts/main: Require Python 3 for Fedora, Python 2 everywhere elseColin Walters2017-02-171-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For a few reasons; among them that we currently have a dependency on `PyYAML` which on Fedora Atomic Host isn't installed for Python 2 by default. Further, many dependencies are being ported in Fedora to be Python 3. Conversely, ensure that we're using Python 2 everywhere else (which is really CentOS/RHEL), since AFAIK we don't test that path at all, and we really don't need *more* entries in the supported matrix.
* | | Merge pull request #3403 from kwoodson/lib_openshift_compatScott Dodson2017-02-1714-14/+14
|\ \ \ | | | | | | | | Compatibility for python2,3.
| * | | String compatibility for python2,3Kenny Woodson2017-02-1714-14/+14
| | | |
* | | | Merge pull request #3404 from giuseppe/do-not-fail-on-grepScott Dodson2017-02-171-0/+1
|\ \ \ \ | | | | | | | | | | post_control_plane.yml: don't fail on grep
| * | | | post_control_plane.yml: don't fail on grepGiuseppe Scrivano2017-02-171-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | grep returns rc != 0 if the text is not found, the next rule assumes that. Do not fail on the check when the line is not found. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
* | | | Merge pull request #3405 from sdodson/BZ1423430Scott Dodson2017-02-171-3/+2
|\ \ \ \ | | | | | | | | | | Fix indenting/ordering in router cert redeploy
| * | | | Fix indenting/ordering in router cert redeployScott Dodson2017-02-171-3/+2
| |/ / / | | | | | | | | | | | | Fixes Bug 1423430
* | | | Merge pull request #3399 from mtnbikenc/deprecationRussell Teague2017-02-171-1/+1
|\ \ \ \ | |/ / / |/| | | Resolve deprecation warning