Colton Myers
ed940ad5f5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
salt/cloud/clouds/gce.py
salt/cloud/clouds/openstack.py
tests/unit/modules/artifactory_test.py
tests/unit/modules/groupadd_test.py
tests/unit/modules/jboss7_test.py
tests/unit/states/jboss7_test.py
2015-08-25 13:55:44 -06:00
Erik Johnson
81a0d4c915
Skip tests that don't work with older mock
...
This fixes test failures on RHEL6 builds.
This also removes two win_network tests which were clearly made to pass
only in Jenkins, and not in a chrooted build environment.
2015-08-21 21:35:11 -05:00
Michael Steed
afbd52bad7
py3: fix tests/unit/modules/win_network_test.py
...
Use types.ModuleType() instead of deprecated new.module()
2015-06-09 14:08:44 -06:00
Jayesh Kariya
17987d97f0
made changes to test_interfaces function.
2015-05-13 10:35:05 -06:00
Jayesh Kariya
0936e1d386
made changes to test_interfaces function.
2015-05-13 11:09:40 +05:30
Jayesh Kariya
4c2a3f01b5
used @patch for mocking.
2015-04-15 12:10:54 +05:30
Jayesh Kariya
aa3a793d8f
removed Mocknetwork call
2015-04-14 17:42:15 +05:30
Jayesh Kariya
1bb4251aa1
adding win_network unit test case
2015-04-14 15:49:20 +05:30
Nicole Thomas
89d53bc063
Revert "adding win_network unit test case."
2015-04-13 09:56:05 -06:00
Jayesh Kariya
63bf71edec
adding win_network unit test case.
2015-04-13 18:08:46 +05:30
