Commit Graph

9843 Commits

Author SHA1 Message Date
Daniel Wallace
a09eb0453a clean up test 2017-05-02 16:39:07 -06:00
Daniel Wallace
185c405265 fix dockermod test 2017-05-02 16:31:38 -06:00
Daniel Wallace
948830a4cb add tests 2017-05-02 16:16:51 -06:00
Nicole Thomas
1c0c53bcd0 Merge pull request #41006 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-05-02 12:49:23 -06:00
rallytime
ecb962cdee Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/runners/saltutil.py
2017-05-02 09:00:22 -06:00
Erik Johnson
39157b40ed Fix some git_pillar integration test failures
For some reason these were not failing when I opened #40777, but now
that the PR is merged are failing for PR builds (as well as locally in
my test env). This fixes those failures.
2017-05-01 17:13:42 -05:00
Mike Place
f766c97e26 Merge pull request #40777 from terminalmage/issue39349
Add git_pillar integration tests
2017-05-01 13:51:19 -06:00
Mike Place
678595f869 Merge pull request #40944 from gtmanfred/cloud
allow dynamic loading of cloud drivers
2017-05-01 12:02:40 -06:00
Anthony Shaw
77cdd3c2dc
backward compatibility with older versions of libcloud where snapshots don't have a name field 2017-05-01 21:05:33 +10:00
Anthony Shaw
e85f1a4314
snapshot name seems to be a recent addition 2017-05-01 14:28:54 +10:00
Anthony Shaw
7ec1d6ba83
lint fixes 2017-04-30 21:49:54 +10:00
Anthony Shaw
1c4a03c538
key pair management methods and tests, linting 2017-04-30 20:28:20 +10:00
Anthony Shaw
06e94dcb58
add image management methods and tests 2017-04-30 19:49:54 +10:00
Anthony Shaw
277933e8d8
add volume, list_images, snapshot methods and tests 2017-04-30 15:04:50 +10:00
Anthony Shaw
3f8827f6b4
add list_volumes 2017-04-29 15:54:59 +10:00
Anthony Shaw
ec95304153
destroy and reboot node 2017-04-29 15:45:07 +10:00
Anthony Shaw
cc40734255
implement list_locations 2017-04-29 15:33:20 +10:00
Anthony Shaw
3c6f13699b
unit tests for list_nodes and list_sizes with implementation 2017-04-29 15:24:15 +10:00
Anthony Shaw
bb62c73b1b
clean up dns test method 2017-04-29 10:48:04 +10:00
Anthony Shaw
1c808dbbc0
inherit from dicts for test classes 2017-04-29 09:55:27 +10:00
Anthony Shaw
d9ee7b3b7f Fix class rename errors. 2017-04-29 08:28:28 +10:00
Anthony Shaw
e92a7ba660 Merge branch 'develop' into libcloud_state 2017-04-29 07:43:28 +10:00
Erik Johnson
402be207b2 Skip Pygit2 tests until EPEL fixes pygit2/libgit2 version mismatch
We can revert this commit once they get the updated pygit2 pushed to
EPEL stable.
2017-04-28 13:25:02 -05:00
rallytime
13a09fc31d Remove extra line left over from merge conflict resolution 2017-04-28 10:13:47 -06:00
rallytime
f875ee3309 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - tests/integration/runners/test_runner_returns.py
2017-04-28 09:26:26 -06:00
Daniel Wallace
3a26d5d42d add cloud to saltutil sync test 2017-04-28 09:12:05 -06:00
Pedro Algarvio
fc90c8ec06
Switch how IOLoop's are run on these tests 2017-04-28 13:36:45 +01:00
Pedro Algarvio
e6ee82e7be
The expected error message is different on py2 and py3 2017-04-28 13:36:45 +01:00
Pedro Algarvio
75c035f09f
Fix basic stats when the test daemons are not running 2017-04-28 13:36:45 +01:00
Pedro Algarvio
d65742c066
Delete attributes 2017-04-28 13:36:44 +01:00
Pedro Algarvio
abe608d739
Drop @patch usage 2017-04-28 13:36:42 +01:00
Pedro Algarvio
4b59c351e4
This branch no longer targets py 2.6 2017-04-28 13:33:37 +01:00
Pedro Algarvio
7b503e562b
Use setUpClass instead of __init__ 2017-04-28 13:33:37 +01:00
Pedro Algarvio
0ae04c01ef
Delete all attributes even strings, boolean, integers 2017-04-28 13:33:37 +01:00
Pedro Algarvio
a0da182e0c
Setup console logging 2017-04-28 13:33:37 +01:00
Pedro Algarvio
2c6725d96e
Tell python that we're done with this dictionary 2017-04-28 13:33:37 +01:00
Pedro Algarvio
9a3f6d1350
Properly handle non native strings under py2 and py3 2017-04-28 13:33:36 +01:00
Pedro Algarvio
5ed3d8d98c
Don't error out because of bad file descriptor errors 2017-04-28 13:33:36 +01:00
Pedro Algarvio
102d63e238
Use self.addCleanup instead 2017-04-28 13:33:36 +01:00
Pedro Algarvio
88627d312f
Write the generated configuration into a config file 2017-04-28 13:33:36 +01:00
Pedro Algarvio
ef3dbb10de
Lint fixes 2017-04-28 13:33:35 +01:00
Pedro Algarvio
9ffc79ca67
Use tornado HTTPClient directly. 2017-04-28 13:33:35 +01:00
Pedro Algarvio
80b80e5416
Fix cherrypy memory leakage
* Clean its event/signal bus since our tests don't rely on those.
* No test class level dictionaries
2017-04-28 13:33:35 +01:00
Pedro Algarvio
dfeb3da8dc
Minor cleanup changes 2017-04-28 13:33:34 +01:00
Pedro Algarvio
3bf84e2a4e
Rename classes in order not to be collected up by pytest 2017-04-28 13:33:34 +01:00
Pedro Algarvio
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator 2017-04-28 13:33:34 +01:00
Pedro Algarvio
6eac0ee132
Call tearDown and not setUp
@cachedout with this change, the FD's still attached code will always
fail, so, for now, that's just commented out.
When you wrote this, did tornado eventually cleaned these FD's?
2017-04-28 13:33:34 +01:00
Pedro Algarvio
6364128ad3
Fix tornado test cases 2017-04-28 13:33:34 +01:00
Pedro Algarvio
701280ae18
Cleanup 2017-04-28 13:33:33 +01:00
Pedro Algarvio
46fe7f63a7
Don't hardcode to root 2017-04-28 13:33:33 +01:00