Commit Graph

9843 Commits

Author SHA1 Message Date
Pedro Algarvio
75569c8e99
unittest.TestCase does not have a skip() method. It's skipTest. 2017-04-28 13:33:33 +01:00
Pedro Algarvio
4062bd9fd9
Don't attempt connections at the module level! 2017-04-28 13:33:32 +01:00
Pedro Algarvio
1d8f02f635
Drop @patch usage. Py3 Compat. 2017-04-28 13:33:32 +01:00
Pedro Algarvio
41df7eca96
Use setUpClass instead of __init__ 2017-04-28 13:33:31 +01:00
Mike Place
78011f8740 Merge pull request #40761 from meaksh/develop-pkg-minor-fixes
Minor fixes on new pkg.list_downloaded
2017-04-28 06:32:48 -06:00
Erik Johnson
9f27f362ca Add HTTP git_pillar integration tests for pygit2
Also work around ssh auth issues in Ubuntu
2017-04-27 18:20:18 -05:00
rallytime
a876bcdb8a Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-27 10:37:05 -06:00
Erik Johnson
9e6361c6c8 Add GitPython HTTP git_pillar tests 2017-04-27 00:48:24 -05:00
Nicole Thomas
76d6419cfd Merge pull request #40868 from gtmanfred/develop
Add Zookeeper tests
2017-04-26 09:44:16 -06:00
Pablo Suárez Hernández
9b241b7338 Adapting Zypper test to new list_downloaded output 2017-04-26 12:35:27 +01:00
Pablo Suarez Hernandez
ddf98e3fe3 Enhances pkg.list_downloaded information of a package 2017-04-26 12:34:13 +01:00
Anthony Shaw
48d2575f77
remove the integration test for dns 2017-04-26 17:02:48 +10:00
Anthony Shaw
df93290f24
update DNS states to support dictionary responses 2017-04-26 13:34:52 +10:00
Nicole Thomas
d14def6454 Merge pull request #40874 from tonybaloney/libcloud_load_balancer_states
Add Apache Libcloud Load Balancer State module
2017-04-25 16:45:40 -06:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen
[nitrogen] Merge forward from 2016.11 to nitrogen
2017-04-25 16:42:11 -06:00
rallytime
2f1998ac00 Pylint extra space 2017-04-25 16:41:39 -06:00
Daniel Wallace
eb24f5381a fix pylint 2017-04-25 15:26:12 -06:00
rallytime
ad9914353b Pylint fixes 2017-04-25 14:18:50 -06:00
Daniel Wallace
f3825d3f5e skip tests if kazoo is not installed 2017-04-25 12:20:35 -06:00
rallytime
d7831c451c Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-25 11:09:01 -06:00
rallytime
c3f4874c21 Pylint fixes and rework new test in dimensiondata cloud unit tests 2017-04-25 11:06:55 -06:00
rallytime
8e24b3a8b2 Pylint fixes for some cloud unit tests 2017-04-25 11:06:39 -06:00
rallytime
7f14a6491e Rename nova and openstack unit tests to test_*.py 2017-04-25 09:27:11 -06:00
Anthony Shaw
5dee8b12de
add support for custom algorithms and complementary test 2017-04-25 21:47:38 +10:00
Anthony Shaw
867e6c1ce5
tests for load balancer and lint for other modules, fixes for load balancer 2017-04-25 21:07:27 +10:00
Anthony Shaw
5f03b7a506
tests for load balancer and fixed issue with destroy balancer 2017-04-25 20:44:36 +10:00
Anthony Shaw
bb4ec6c4db
tests for the storage module 2017-04-25 20:27:52 +10:00
Daniel Wallace
0ee3ecf464 Add tests for Zookeeper states 2017-04-24 18:01:16 -06:00
Nicole Thomas
eb8fd68154 Merge pull request #40844 from tonybaloney/libcloud_storage
Added execution and state modules for Apache Libcloud
2017-04-24 17:10:33 -06:00
rallytime
a1f9ae67e1 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-24 15:37:09 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
2017-04-24 15:35:28 -06:00
Anthony Shaw
2ec6da0383 Merge branch 'develop' into libcloud_storage 2017-04-25 07:25:57 +10:00
rallytime
44623863fa Clean up integration test checks to be more encompassing 2017-04-24 15:12:20 -06:00
rallytime
3dc93be6f6 Skip test if no charmaps are found
The "loacle -m" command might not return an error, but it might
just be empty. Let's not fail on a test that we're already logging
to the user.
2017-04-24 12:38:49 -06:00
rallytime
7efebc9f78 Remove assertion against an empty string
Returning an empty string is the expected behavior if the locale
is not set. This happens for example on the Fedora 24 test boxes.
2017-04-24 12:19:06 -06:00
rallytime
e3550ab44c Skip gen_locale test if charmaps aren't available on the test machine
The error of missing charmaps gets logged to the user. We shouldn't
be running the test for the gen_locale if we don't have charmaps
available on the test machine.
2017-04-24 12:17:29 -06:00
Erik Johnson
3881b6e0f3 Prepare git_pillar test code for adding HTTP tests
This further abstracts some of the setup and teardown code so it can be
used for git-over-http tests.

It also moves the code that was originally added to the archive
state integration tests to create a local http server into
salt.support.helpers so that it can be more easily and portably used.
2017-04-24 11:00:39 -05:00
rallytime
ce13658301 Lint fixes for keystone state and keystone state unit tests 2017-04-24 09:27:52 -06:00
Anthony Shaw
2b4d84ef3f
add a unit test to check the module starts correctly 2017-04-24 16:35:16 +10:00
Mike Place
0093851334 Merge pull request #40782 from wolfpackmars2/patch-6
Add kernelversion grain
2017-04-23 04:24:36 -06:00
Mike Place
6da806d1cc Merge pull request #39850 from epcim/pr_fix_keystone_endpoints_multiregion
Fix endpoint handling per region
2017-04-23 04:00:00 -06:00
Bo Maryniuk
116c96a4b7 Fix UT parameter changes 2017-04-22 10:08:20 +02:00
Bo Maryniuk
ed84420df0 Add unit test for node ip filtering 2017-04-22 10:08:20 +02:00
Bo Maryniuk
82582cff77 Skip test, if libcloud is not around 2017-04-22 10:08:20 +02:00
Bo Maryniuk
f005d53c56 Fix name error exception 2017-04-22 10:08:20 +02:00
Bo Maryniuk
5e574a24d9 Add unit test for nova connector 2017-04-22 10:08:19 +02:00
Bo Maryniuk
cd43805770 Add initial unit test for openstack cloud module 2017-04-22 10:08:19 +02:00
Bo Maryniuk
177f31446d Add fake preferred IP function for testing 2017-04-22 10:08:19 +02:00
rallytime
3898117d6e Update os_family grain to be "Suse" instead of "SUSE" for localemod
Also update some of the test functions to be a little more clear
2017-04-21 16:14:50 -06:00
rallytime
a7eb8f717e Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-21 09:50:25 -06:00
Petr Michalec
ab1dd446e7
Endpoint handling per region, fixes #35874
- extend tests for multiple regions
- region arg by default set to None
- print verbose changes to be exec.
2017-04-21 15:48:52 +02:00
Mike Place
8652ad68c8 Merge pull request #40753 from arno01/dockerng-enhanced
dockerng: avoid network duplication and add driver_opts
2017-04-21 05:21:33 -06:00
Andrey Arapov
4c29c5f6ab
dockerng: avoid network duplication and add driver_opts 2017-04-21 08:52:55 +02:00
rallytime
d5b1241972 Skip tsl unit test when we hit an error due to OpenSSL and junos-eznc packaging conflict
he pip junos-eznc package, when installed with PyOpenSSL version 0.14 causes
this test failure. If you either remove junos-eznc, or upgrade PyOpenSSL
(current is 0.17) the test is happy. So, we need to handle this case in the test.
2017-04-20 17:02:33 -06:00
rallytime
55c947adf4 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-20 13:44:37 -06:00
rallytime
bad421be66 Update managed.sls test file: osmajorrelease grain is an int now
We need to make the comparison in the file to `7` instead of `'7'`,
otherwise the state doesn't execute correctly and the test_pkgrepo
test will fail because the state didn't run.
2017-04-20 12:27:45 -06:00
Mike Place
ba2e7dd4f6 Merge pull request #40697 from DSRCorporation/bugs/35691_cache_full_ret
Keep all return-related values in the job cache.
2017-04-20 11:57:27 -06:00
Erik Johnson
e03698fbeb Add git_pillar integration tests
This also adds a new section to the runtests.py so that ext_pillar
integration tests can be run separately.
2017-04-20 03:51:08 -05:00
Erik Johnson
7cef07b0d9 Remove legacy git_pillar tests
Also remove git_pillar configuration from the test suite's master
configuration file.
2017-04-20 03:51:08 -05:00
Steve Groesz
715df9a911 Add test for new kernelversion grain 2017-04-19 17:46:00 -05:00
Pablo Suárez Hernández
bd1f170a05 Fixes Zypper unit test 2017-04-19 10:18:46 +01:00
rallytime
0616405104 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-18 16:43:11 -06:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen'
No conflicts.
2017-04-18 16:42:30 -06:00
Nicole Thomas
d0b90058c4 Merge pull request #40706 from twangboy/fix_whitelist
Remove non-existent tests from whitelist
2017-04-18 10:30:55 -06:00
Mike Place
2ab95b7dd5 Set minion test to use default opts 2017-04-18 08:34:57 -06:00
Dmitry Kuzmenko
f9d2c4da8f Minor: unit test fix. 2017-04-18 11:56:20 +03:00
twangboy
e4876abcde Add back the two loader tests 2017-04-17 14:04:20 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
2017-04-17 13:32:56 -06:00
rallytime
885419b3e7 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-17 13:27:58 -06:00
Mike Place
f7b062acd7 Merge pull request #40266 from meaksh/develop-pkg-improvements
[develop] Adding "pkg.downloaded" state and support for installing patches/erratas
2017-04-17 11:34:42 -06:00
Pablo Suárez Hernández
fa9e7f01f7 Pylint fix 2017-04-17 14:18:09 +01:00
Pablo Suárez Hernández
40422ecd02 Adding more unit tests for Zypper module 2017-04-17 13:06:35 +01:00
Pablo Suárez Hernández
5701e90803 Adding unit tests for Zypper execution module 2017-04-17 13:02:08 +01:00
twangboy
9d7f78e896 Remove non-existent tests from whitelist 2017-04-14 14:35:06 -06:00
Nicole Thomas
77028a6c4e Merge pull request #40685 from Ch3LL/fix_mac_file
Fix errno code for filecache test for other operating systems.
2017-04-14 10:54:25 -06:00
rallytime
9905eb7273 Merge branch 'nitrogen' into 'develop'
Conflicts:
  - salt/netapi/__init__.py
2017-04-14 10:50:31 -06:00
rallytime
f552dd63f3 Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - pkg/windows/installer/Salt-Minion-Setup.nsi
  - tests/unit/states/test_tomcat.py
2017-04-14 10:46:56 -06:00
Ch3LL
9ea6e8b456
remove io and change to EROFS 2017-04-13 18:10:44 -04:00
Ch3LL
688791ff60
remove try-except and change errno 2017-04-13 17:06:44 -04:00
Mike Place
ad4d6839fd Merge pull request #40675 from gtmanfred/2016.11
use loader for getting war version
2017-04-13 13:58:30 -06:00
rallytime
e440d2e8af Use self.setGrains as context manager in grains test 2017-04-13 13:39:11 -06:00
Nicole Thomas
88f514835d Merge pull request #40677 from rallytime/merge-develop
[develop] Merge forward from nitrogen to develop
2017-04-13 13:19:07 -06:00
Ch3LL
e30afc4c01
add exception type 2017-04-13 15:06:12 -04:00
Ch3LL
acf333df08
change errno code for fileclient test 2017-04-13 14:56:45 -04:00
rallytime
3d6c983c69 Remove unused import for lint 2017-04-13 11:52:20 -06:00
Daniel Wallace
a61fc824c4 use loader for war extraction
Also set the version added in the docs
2017-04-13 11:51:22 -06:00
rallytime
17efc7341c Merge branch '2016.11' into 'nitrogen'
Conflicts:
  - salt/modules/win_wua.py
  - salt/netapi/rest_cherrypy/app.py
  - salt/version.py
  - tests/unit/states/grains_test.py
  - tests/unit/states/test_archive.py
2017-04-13 10:14:51 -06:00
Ch3LL
60724980ec
fix test_fstype test for mac 2017-04-13 12:04:20 -04:00
Mike Place
5668cc39de Merge pull request #39802 from cachedout/random_startup_delay
A random startup delay option for minions
2017-04-13 09:53:06 -06:00
rallytime
5282ea2480 Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-13 09:46:05 -06:00
Mike Place
92b5f03beb Merge pull request #40551 from terminalmage/issue39868
Fix four issues in archive.extracted state
2017-04-12 12:37:51 -06:00
Nicole Thomas
b735b8f574 Merge pull request #40603 from kiorky/fix40602
Fix #40602: onfail_stop: test loop order is broken
2017-04-12 10:06:55 -06:00
Daniel Wallace
b0bd99c26d add comment and unit test 2017-04-11 21:08:06 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
2017-04-11 16:49:15 -06:00
Mike Place
5c2be60d7b Space for lint 2017-04-11 16:46:38 -06:00
rallytime
749840ce5f Merge branch 'nitrogen' into 'develop'
No conflicts.
2017-04-11 15:11:46 -06:00
rallytime
cd0adb82d6 Spelling fix 2017-04-11 13:35:38 -06:00
rallytime
36f7a6481b Remove blacklisted loader usage of dunder variables 2017-04-11 12:16:15 -06:00
Erik Johnson
20f856f038 Update unit tests for numeric osmajorrelease 2017-04-11 12:36:36 -05:00
Mike Place
33a6224dcf
Set minion test to use default opts 2017-04-11 09:28:19 -06:00