Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bug 1425321. Default the master api port based on the facts | Jeff Cantrill | 2017-02-21 | 2 | -2/+2 |
| | |||||
* | Merge pull request #3428 from giuseppe/do-not-parse-latest | Scott Dodson | 2017-02-21 | 1 | -1/+1 |
|\ | | | | | openshift_facts: handle 'latest' version | ||||
| * | openshift_facts: handle 'latest' version | Giuseppe Scrivano | 2017-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | do not attempt to compare the version using LooseVersion when 'latest' is used. The case openshift_version == None already sets to use the last version, so simply reuse that. Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com> | ||||
* | | Merge pull request #3409 from ewolinetz/logging_fix_verify_api | Scott Dodson | 2017-02-20 | 2 | -0/+42 |
|\ \ | | | | | | | Adding missing handler to resolve error that it was not found | ||||
| * | | Reverting logic for verify api handler to be uniform with other ways we ↵ | ewolinetz | 2017-02-20 | 2 | -10/+30 |
| | | | | | | | | | | | | verify, will be uniformly updated in future | ||||
| * | | updating until statments on uri module for api verification | ewolinetz | 2017-02-17 | 2 | -2/+2 |
| | | | |||||
| * | | Updating to use uri module instead | ewolinetz | 2017-02-17 | 2 | -30/+10 |
| | | | |||||
| * | | Adding missing handler to resolve error that it was not found | ewolinetz | 2017-02-17 | 2 | -0/+42 |
| | | | |||||
* | | | Merge pull request #3427 from ewolinetz/logging_quote_nodeselector_value | Scott Dodson | 2017-02-20 | 3 | -3/+3 |
|\ \ \ | | | | | | | | | Surrounding node selector values with quotes | ||||
| * | | | Surrounding node selector values with quotes | ewolinetz | 2017-02-20 | 3 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #3422 from mtnbikenc/logging-fix | Russell Teague | 2017-02-20 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | [openshift_logging] Correct logic test for running pods | ||||
| * | | | Correct logic test for running pods | Russell Teague | 2017-02-20 | 1 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #3424 from ashcrow/new-modules-py3 | Jason DeTiberus | 2017-02-20 | 3 | -4/+4 |
|\ \ \ \ | | | | | | | | | | | Replace has_key in new modules | ||||
| * | | | | Replace has_key in new modules | Steve Milner | 2017-02-20 | 3 | -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/pytest | Jason DeTiberus | 2017-02-20 | 4 | -332/+271 |
|\ \ \ \ | | | | | | | | | | | Migrate from nose to pytest | ||||
| * | | | | Extract assertion common to all tests as function | Rodolfo Carvalho | 2017-02-20 | 2 | -56/+24 |
| | | | | | |||||
| * | | | | Replace nose yield-style tests w/ pytest fixtures | Rodolfo Carvalho | 2017-02-20 | 3 | -248/+247 |
| | | | | | |||||
| * | | | | Make tests run with either nosetests or pytest | Rodolfo Carvalho | 2017-02-20 | 3 | -45/+42 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 assert | Rodolfo Carvalho | 2017-02-20 | 2 | -28/+24 |
| | | | | | | | | | | | | | | | | | | | | In the intention to remove the dependency on nose and use only pytest. | ||||
| * | | | | Make usage of short_version/release consistent | Rodolfo Carvalho | 2017-02-20 | 2 | -27/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This removes irrelevant differences between the two test files, making it easier to observe similarities. | ||||
| * | | | | Reorganize tests and helper functions logically | Rodolfo Carvalho | 2017-02-20 | 2 | -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 duplication | Rodolfo Carvalho | 2017-02-20 | 3 | -80/+60 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate tests for bad input into a single file instead of having the same code in two files. | ||||
| * | | | | Move similar test cases together | Rodolfo Carvalho | 2017-02-20 | 2 | -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.path | Rodolfo Carvalho | 2017-02-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://stackoverflow.com/a/10097543/4804690 Additionally, avoid using platform-specific '/' and '..'. | ||||
| * | | | | Rename test for consistency | Rodolfo Carvalho | 2017-02-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix validation of generated code | Rodolfo Carvalho | 2017-02-20 | 1 | -1/+1 |
|/ / / / | | | | | | | | | | | | | | | | | 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-playbooks | Russell Teague | 2017-02-20 | 1 | -16/+21 |
|\ \ \ \ | | | | | | | | | | | Updating node playbooks to use oc_obj | ||||
| * | | | | Updating node playbooks to use oc_obj | Russell Teague | 2017-02-17 | 1 | -16/+21 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3340 from etsauer/scale-router | Scott Dodson | 2017-02-20 | 1 | -0/+24 |
|\ \ \ \ | |_|/ / |/| | | | Making router pods scale with infra nodes | ||||
| * | | | Removing trailing spaces | Eric Sauer | 2017-02-13 | 1 | -2/+2 |
| | | | | |||||
| * | | | Making router pods scale with infra nodes | Eric Sauer | 2017-02-10 | 1 | -0/+24 |
| | | | | |||||
* | | | | Unset exec bit in tests, add missing requirements | Jason DeTiberus | 2017-02-19 | 13 | -0/+0 |
| | | | | | | | | | | | | | | | | was: separate lib_ unit tests from other unit tests | ||||
* | | | | Include missing unit tests to test runner config | Rodolfo Carvalho | 2017-02-19 | 13 | -0/+0 |
| | | | | | | | | | | | | | | | | We were not running those tests in CI, bad :( | ||||
* | | | | Fix tests on Python 3 | Rodolfo Carvalho | 2017-02-19 | 2 | -2/+2 |
| |_|/ |/| | | | | | | | | | | | | | | Unlike in Python 2: - `range` doesn't return a list. - `dict.keys` doesn't return a list. | ||||
* | | | Merge pull request #3412 from rhcarvalho/dead-code | Rodolfo Carvalho | 2017-02-19 | 2 | -34/+0 |
|\ \ \ | | | | | | | | | Remove and document how to find dead Python code | ||||
| * | | | Remove dead code | Rodolfo Carvalho | 2017-02-18 | 2 | -34/+0 |
| | | | | |||||
* | | | | Merge pull request #3411 from kwoodson/oc_route_remove_debug | Kenny Woodson | 2017-02-18 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fixing a bug by removing default debug output. | ||||
| * | | | Fixing a bug by removing default debug | Kenny Woodson | 2017-02-17 | 2 | -2/+2 |
| | |/ | |/| | |||||
* | | | Merge pull request #3402 from cgwalters/fedora-python3 | Scott Dodson | 2017-02-17 | 1 | -0/+12 |
|\ \ \ | |/ / |/| | | facts/main: Require Python 3 for Fedora, Python 2 everywhere else | ||||
| * | | facts/main: Require Python 3 for Fedora, Python 2 everywhere else | Colin Walters | 2017-02-17 | 1 | -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_compat | Scott Dodson | 2017-02-17 | 14 | -14/+14 |
|\ \ \ | | | | | | | | | Compatibility for python2,3. | ||||
| * | | | String compatibility for python2,3 | Kenny Woodson | 2017-02-17 | 14 | -14/+14 |
| | | | | |||||
* | | | | Merge pull request #3399 from mtnbikenc/deprecation | Russell Teague | 2017-02-17 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Resolve deprecation warning | ||||
| * | | | Resolve deprecation warning | Russell Teague | 2017-02-17 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #3369 from ashcrow/attach-cloudfront | Scott Dodson | 2017-02-17 | 3 | -11/+25 |
|\ \ \ \ | |/ / / |/| | | | WIP: Register cloudfront privkey when required | ||||
| * | | | Register cloudfront privkey when required | Steve Milner | 2017-02-16 | 3 | -11/+25 |
| | | | | |||||
* | | | | Don't attempt to install python-ruamel-yaml on atomic | Scott Dodson | 2017-02-16 | 2 | -0/+12 |
| | | | | |||||
* | | | | Merge pull request #3383 from kwoodson/yedit_yaml_support | Scott Dodson | 2017-02-16 | 21 | -315/+929 |
|\ \ \ \ | | | | | | | | | | | Adding fallback support for pyyaml. | ||||
| * | | | | Pleasing the linting gods. | Kenny Woodson | 2017-02-16 | 19 | -81/+213 |
| | | | | | |||||
| * | | | | Fixed tests for pyyaml vs ruamel. Added import logic. Fixed safe load. | Kenny Woodson | 2017-02-16 | 18 | -95/+297 |
| | | | | |