Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | | | |||||
| * | | | | Adding fallback support for pyyaml. | Kenny Woodson | 2017-02-16 | 18 | -205/+485 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #3386 from bparees/bump_templates | Scott Dodson | 2017-02-16 | 9 | -10/+37 |
|\ \ \ \ | | | | | | | | | | | update example templates+imagestreams | ||||
| * | | | | update example templates+imagestreams | Ben Parees | 2017-02-16 | 9 | -10/+37 |
| |/ / / | |||||
* | | | | Merge pull request #3370 from adbaldi/work | Scott Dodson | 2017-02-16 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging) | ||||
| * | | | Fixed issue where upgrade fails when using daemon sets (e.g. aggregated logging) | Andrew Baldi | 2017-02-15 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #3381 from jcantrill/bz_1420217_default_es_memory | Eric Wolinetz | 2017-02-16 | 1 | -2/+2 |
|\ \ \ | | | | | | | | | bug 1420217. Default ES memory to be compariable to 3.4 deployer | ||||
| * | | | bug 1420217. Default ES memory to be compariable to 3.4 deployer | Jeff Cantrill | 2017-02-16 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #3374 from mwringe/hawkular-metrics-certificates | Scott Dodson | 2017-02-16 | 2 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Fix issues with Hawkular Metrics certificates | ||||
| * | | | | Add missing full hostname for the Hawkular Metrics certificate (BZ1421060) | mwringe | 2017-02-15 | 2 | -2/+2 |
| |/ / / | | | | | | | | | | | | | Fix issue where the signer certificate's name is static, preventing redeployments from being acceptable. | ||||
* | | | | Merge pull request #3375 from abutcher/revert-openshift-facts-skip | Scott Dodson | 2017-02-16 | 1 | -60/+46 |
|\ \ \ \ | | | | | | | | | | | Revert "Add block+when skip to `openshift_facts` tasks" | ||||
| * | | | | Revert "Add block+when skip to `openshift_facts` tasks" | Andrew Butcher | 2017-02-15 | 1 | -60/+46 |
| |/ / / | | | | | | | | | | | | | This reverts commit 0b1c1c2c524bfb932ab0e15f63f464673c00e651. | ||||
* | | | | adding some quotes for safety | ewolinetz | 2017-02-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | fixing use of oc_scale module | ewolinetz | 2017-02-15 | 2 | -2/+2 |
| | | | | |||||
* | | | | fixing default for logging | ewolinetz | 2017-02-15 | 1 | -3/+3 |
|/ / / |