summaryrefslogtreecommitdiff
path: root/tests/unittests/test_merging.py
AgeCommit message (Expand)Author
2016-12-22LICENSE: Allow dual licensing GPL-3 or Apache 2.0Jon Grimm
2016-05-24fix logic error in ec2 get_instance_userdata and slow testsScott Moser
2016-05-12run flake8 instead of pyflakes in tox. expect tests/ to pass flake8.Scott Moser
2015-01-22Low hanging Python 3 fruit.Barry Warsaw
2014-08-26further remove evidence of pylint.Scott Moser
2014-07-23more import statementsDimitri John Ledkov
2013-05-10fix pylintScott Moser
2013-05-10fix pep8Scott Moser
2013-05-09Fix the cloud config merging so that it is backwards compat.Joshua Harlow
2013-05-04Add a set of randomized (seeded) dict tests.Joshua Harlow
2013-05-03A few pep8/pylint cleanups.Joshua Harlow
2013-05-03Rename the merge cc sample function name.Joshua Harlow
2013-05-03A few more tests + cleanings.Joshua Harlow
2013-05-03More merging adjustments.Joshua Harlow
2013-04-23Add a bunch of new merging test files + runner.Joshua Harlow
2013-03-07more pep8/pylint. all clean nowScott Moser
2013-03-07fix pep8 and pylintScott Moser
2013-03-05Add in a bunch of changes and tests.Joshua Harlow
2012-11-08Ensure that at needed stages the local variablesJoshua Harlow
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-14 18:08:58 +0000