valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
83,054 Commits 24 Branches 182 Tags 341 MiB
882fcd846f
Commit Graph

3717 Commits

Author SHA1 Message Date
rallytime
b9d1ce9aed Revert "Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch" 
This reverts commit 9eb482d5c7.
 2017-05-04 14:45:38 -06:00
rallytime
c91bb18298 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/modules/pip.py
  - salt/states/saltmod.py
 2017-05-04 11:49:33 -06:00
rallytime
9eb482d5c7 Skip integration.shell.matcher.MatchTest.test_salt_documentation test for Arch 
This test is failing in Arch due to a bug in salt-testing. Skipping until
salt-testing can be upgraded. For more information, see
https://github.com/saltstack/salt-jenkins/issues/324.
 2017-05-04 11:26:01 -06:00
Mike Place
ff39613a53 Merge pull request #41049 from Ch3LL/fix_wheel_test 
fix integration wheel test_gen test
 2017-05-04 09:33:58 -06:00
Nicole Thomas
2bf02fad81 Merge pull request #41050 from terminalmage/git_pillar-tests 
Fix git_pillar integration tests on Arch
 2017-05-03 16:53:31 -06:00
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Erik Johnson
ee493bae47 Update package targets for Arch pkg tests 
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.

This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
 2017-05-03 17:02:32 -05:00
Erik Johnson
a94d081004 Add check for git-http-backend 
This allows for more graceful test failures when the libexec dir is
different from what the test class determines it should be.
 2017-05-03 15:16:16 -05:00
Ch3LL
ba223827b9
fix integration wheel test_gen test 2017-05-03 15:37:44 -04:00
Mike Place
43af2669f6 Merge pull request #41010 from twangboy/fix_test_standard 
Fix test_full_returns integration test on Windows
 2017-05-03 12:18:25 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
rallytime
bed524a731 Update test hash to be sha256 instead of md5 2017-05-02 16:20:06 -06:00
twangboy
3ef4734d0e Increase timeout for Windows 2017-05-02 11:37:01 -06: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
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
Daniel Wallace
3a26d5d42d add cloud to saltutil sync test 2017-04-28 09:12:05 -06:00
Pedro Algarvio
2c6725d96e
Tell python that we're done with this dictionary 2017-04-28 13:33:37 +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
7480a8e5fb
Check status on setUp not on the module level @skipIf decorator 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
46fe7f63a7
Don't hardcode to root 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
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
Erik Johnson
9e6361c6c8 Add GitPython HTTP git_pillar tests 2017-04-27 00:48:24 -05: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
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
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
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
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
rallytime
5a419b8aae Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pillar.py
 2017-04-07 11:23:41 -06:00
Pedro Algarvio
2d32fab65b
Don't instantiate the log handler if unable to connect to server 2017-04-05 23:29:13 +01:00
Ch3LL
7710355e3a
check for salt install fail on vultur test 2017-04-05 14:39:31 -06:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-04-05 14:15:05 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
 2017-04-05 13:02:14 -06:00
Pedro Algarvio
94d944da52
Limit the size of the log records queue 2017-04-05 16:38:05 +01:00
Pedro Algarvio
0c61c151c3
Fix state logic 2017-04-05 02:07:54 +01:00
Pedro Algarvio
de5fdc6ba8
Purge the account 2017-04-05 00:51:35 +01:00
Pedro Algarvio
cd1f7ba629
Let's use the system temp dir as it was to see if it fixes the test failure 2017-04-05 00:34:39 +01:00
Pedro Algarvio
7b713d9256
Use the more portable helper skip_if_not_root. 2017-04-04 18:58:21 +01:00
Pedro Algarvio
dcf0a55daf
Use the test run temporary path, not the system temporary path 2017-04-04 18:58:21 +01:00
Pedro Algarvio
9bbfd6605c
Fix state files temporary path 2017-04-04 18:58:21 +01:00
Pedro Algarvio
61003bca0a
Take care of resource leakage on tests 2017-04-04 18:58:20 +01:00
Pedro Algarvio
86536e64c5
Make sure files are closed 2017-04-04 18:58:20 +01:00
Pedro Algarvio
2ee6d5d589
Import from the original modules not tests.integration 2017-04-04 18:58:19 +01:00
Pedro Algarvio
6a638620ba
Move base test case modules to tests.support.case 2017-04-04 18:04:39 +01:00
Pedro Algarvio
9af2ca8823
No need to load all modules docs. 
This should reduce memory usage as well as speeding up the decorator
 2017-04-04 18:04:38 +01:00
Pedro Algarvio
785698d2ce
Import for the original module 2017-04-04 18:04:38 +01:00
Pedro Algarvio
b94992f544
Some more RUNTIME_CONFIGS and RUNTIME_VARS fixes 2017-04-04 18:04:38 +01:00
Pedro Algarvio
e163a747f1
Minor import fixes 2017-04-04 17:29:34 +01:00
Pedro Algarvio
8031ac0209
Move mixins to tests.support.mixins. 
The adapted config mixin get config methods are not static methods
 2017-04-04 17:29:34 +01:00
Mike Place
6056ee302a Merge pull request #40339 from s0undt3ch/features/py3-pt2 
[WIP] Move unit tests which were in integration tests - More py3 and mocking fixes
 2017-04-04 10:21:46 -06:00
Mike Place
d254b96498 Merge pull request #40471 from tonybaloney/libcloud_dns_kwargs 
Update to libcloud_dns module to allow custom kwargs for DNS drivers
 2017-04-04 10:12:44 -06:00
Anthony Shaw
8c74d3df89 Update test_libcloud_dns.py 
add absolute imports
 2017-04-04 10:57:32 +10:00
rallytime
ede4c28887 Group checks for failhard setting in () in state.check_failhard function 
Fixes #38683

When two states combine the `require`, `failhard`, and `order` options,
the `order` option should be ignored because `require` is present. Then
the `failhard` option should make the state run fail.

The check for "failhard" in the `check_failhard` function in the state
compiler was too broad. We want "failhard" to be true AND tag to be in
the `running` dict. Without the parens around the first OR statement,
we were bypassing the AND requirement because failhard was found.

Since the second state's tag was not found in the running dict, the state
run stacktraces on a KeyError.
 2017-04-03 14:41:54 -06:00
Pedro Algarvio
863d8d453f
Ignore the unimplemented abstract method 2017-04-01 23:23:50 +01:00
Pedro Algarvio
f5c36f0048
Integration tests should not use the temporary config 2017-04-01 18:33:28 +01:00
Pedro Algarvio
26e60e825c
Allow creating a temporary configuration to be used for a single test 2017-04-01 14:25:55 +01:00
Pedro Algarvio
9a11538b54
Stop using deprecated TestCase methods 2017-04-01 14:22:57 +01:00
Pedro Algarvio
fd6d031804
We now sync all on minion connect 2017-04-01 14:22:56 +01:00
Pedro Algarvio
5950c1dd53
Minor logic fix 2017-04-01 14:22:55 +01:00
Pedro Algarvio
d86dbf466a
Use tests.support.unit instead 2017-04-01 14:22:55 +01:00
Pedro Algarvio
104f7a71f2
Why do need the system grains here?! This is an expensive call. 2017-04-01 14:22:55 +01:00
Pedro Algarvio
f9b58aa2e2
This is not an integration test. Skip test. 
Skipping tests since I have no clue what is supposed to be tested here
with that `raise Exception(ret)` at the end.
 2017-04-01 14:22:53 +01:00
Pedro Algarvio
94c7df78ed
Skip tests on required missing libs 2017-04-01 14:22:53 +01:00
Pedro Algarvio
a013f792c6
We actually need to fix the pip state to recognize new/deprecated options 2017-04-01 14:22:52 +01:00
Pedro Algarvio
22c753afba
Disable pip wheel usage for this test. 
The pip cache dir will be owned by root and not the user created.
Revisit this issue ASAP.
 2017-04-01 14:22:52 +01:00
Pedro Algarvio
0bf7684b8c
Make the option properties available in the config mixin instead 2017-04-01 14:22:51 +01:00
Pedro Algarvio
d05028e88c
These are not integration tests 2017-04-01 14:22:51 +01:00
Anthony Shaw
7ae7b2574a
add utf8 header 2017-04-01 14:05:28 +11:00
Anthony Shaw
9db623ada2
py3 update and lint fixes 2017-04-01 10:14:29 +11:00
Anthony Shaw
c2681db9a4
commit fix and double check in integration test 2017-04-01 09:25:01 +11:00
Anthony Shaw
eb8ab0d75a
add tests to show broken functionlity reported in bug report 2017-04-01 09:21:25 +11:00
Joseph Hall
e24f89366a Use a slightly more specific bank name 2017-03-31 15:21:26 -06:00
Joseph Hall
3e84d1476a Add cache.store to the runners 2017-03-31 15:16:36 -06:00
Mike Place
d0ed032364 Merge pull request #40441 from Ch3LL/add_vmware_cloud_tests 
Add vmware cloud tests
 2017-03-31 14:06:25 -06:00
Ch3LL
89d1f3943d remove unnecessary try blocks 2017-03-31 09:46:34 -06:00
Ch3LL
5cd34a9083 finish the tests 2017-03-30 15:57:53 -06:00
rallytime
607f3e53e8 Add the @flaky decorator to the reactor integration test 
This test occassionally fails on the develop branch and I cannot
reproduce it. @cachedout recommended to add the flaky decorator
to the test until we can circle back around and look at this more
closely.
 2017-03-30 10:42:26 -06:00
Ch3LL
aa95b99608 add snapshot and fix instance test 2017-03-29 17:41:47 -06:00
Nicole Thomas
d0182ac3ef Merge pull request #40375 from terminalmage/pr-39838 
Cleanup and resubmit of PR #39838 against develop branch
 2017-03-29 10:34:43 -06:00
rallytime
4fbe9f18b8 Use "self.archive_tar_source" instead of undefined ARCHIVE_TAR_SOURCE global 2017-03-29 09:11:46 -06:00
rallytime
52edbffc85 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/cache/all/index.rst
  - doc/topics/cache/index.rst
  - salt/cache/localfs.py
  - salt/modules/boto_rds.py
  - salt/roster/cloud.py
  - salt/states/virtualenv_mod.py
  - tests/integration/states/test_archive.py
  - tests/unit/modules/test_dockermod.py
  - tests/unit/states/dockerng_test.py
 2017-03-28 17:09:30 -06:00
Ch3LL
cbb6eca2cf initial commit for vmware cloud test 2017-03-28 16:23:59 -06:00
Narendra Ingale
4ac73bb55c Added test for issue 39191. 2017-03-28 14:55:05 -05:00
Pedro Algarvio
6dcf7552a7
Py3 fixes. Tests are not destructive. 2017-03-28 19:04:04 +01:00
Pedro Algarvio
ff8cb0455f
Account for a timeout when resolving the future 2017-03-28 19:00:54 +01:00
Pedro Algarvio
6f79dd6af3
Not an integration test 2017-03-28 19:00:51 +01:00
Pedro Algarvio
9731451a58
Use tests.support.unit instead 2017-03-28 19:00:50 +01:00
Pedro Algarvio
7219a35656
These are not integration tests 2017-03-28 19:00:50 +01:00
Ch3LL
4c0ca2a987 remove unnecessary sls file 2017-03-27 12:59:52 -06:00
Ch3LL
aae2a30eda add require_in for an entire sls test 2017-03-27 12:47:36 -06:00
Ch3LL
8b21b4c8bb add use_cmd_unzip test 2017-03-27 10:32:27 -06:00
Nicole Thomas
1d66961ce7 Merge pull request #40242 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-23 13:31:39 -06:00
rallytime
455783a2ef Add ImportError to exception instead of bare "except" 
Fixes lint error on develop.
 2017-03-23 09:01:51 -06:00
Pedro Algarvio
415dcc1a99 Merge pull request #40234 from terminalmage/py3-tests 
More PY3 fixes in test suite
 2017-03-23 09:15:18 +00:00
rallytime
235a768872 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/returners/influxdb_return.py
  - salt/states/dockerng.py
  - salt/utils/schedule.py
  - tests/unit/modules/test_docker.py
  - tests/unit/states/dockerng_test.py
  - tests/unit/utils/test_schedule.py
 2017-03-22 17:44:08 -06:00
Erik Johnson
1cdf5ea737 PY3 compatibility fixes to netapi tests 2017-03-22 16:09:56 -05:00
Erik Johnson
20724839a9 Fix for running just the grains tests 
The -G/--grains/--grains-tests option was being ignored because a suite
was not defined for it. This adds the option, and also adds a dunder
init to satisfy the test parser.
 2017-03-22 14:11:22 -05:00
Erik Johnson
5ad476936d Overhaul Docker support 
This does the following:

- Splits states for container/volume/image/network management into four
  separate state modules.

- Preserves backward compatibility by making ``docker.image_present``
  invoke ``docker_image.present``, etc.

- Changes how Salt detects that a container needs to be replaced.
  Instead of comparing each passed argument to the named container's
  configuration, it creates a temporary container, and compares that
  container to the named container. If the two differ, then the older
  container is removed, and the new one is renamed and started, becoming
  the named container.

- Removes the unit tests for container management and replaces them with
  integration tests.

- Adds unit tests for the new salt.utils.docker
 2017-03-21 16:53:19 -05:00
rallytime
0ba773d86b Skip flaky test for now 2017-03-21 15:47:20 -06:00
rallytime
a6a7538fe4 Pylint fix 2017-03-21 13:39:34 -06:00
rallytime
2222e1cae9 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/napalm_network.py
  - tests/integration/states/test_archive.py
  - tests/integration/states/test_file.py
  - tests/unit/modules/test_docker.py
 2017-03-21 10:19:52 -06:00
rallytime
dd193cc740 Make sure the tornado web server is stopped at the end of the test class 
The tornado web aplication that was set up in the archive tests, and then
duplicated in the remote file integration tests, starts the web server,
but never stops it. This creates a stacktrace that hangs the other test
file that attempts to start the web server.

The Application class has a `listen()` function, but not a `stop()` function.
The change uses the `HTTPServer` class to set up the listening server, but
also has the necessary `stop()` function. (The `listen()` function from the
`Application` class just calls out to the `HTTPServer`'s `listen()` function,
so this works nicely here.)

We can then call the `stop()` function in the `tearDownClass` class method.

I also removed some duplicate STATE_DIR definitions.
 2017-03-20 13:08:17 -06:00
Nicole Thomas
201846ff01 Merge pull request #40129 from terminalmage/py3-tests 
Python 3 compatibility fixes
 2017-03-17 17:49:26 -06:00
Erik Johnson
8676f7d14a Add pip3 to list of commands in which_bin test 2017-03-16 22:07:52 -05:00
Nicole Thomas
d64dee46bd Merge pull request #40061 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-16 11:16:52 -06:00
Erik Johnson
3923305141 Sort list of minions in batch to make tests consistent 2017-03-16 12:00:38 -05:00
Erik Johnson
5b71db29d5 Use user.present/absent states to manage user in virtualenv test 2017-03-15 17:18:25 -05:00
Erik Johnson
eb09901f36 Simplify the user state integration tests 
Put the skipIf and the destructiveTest decorators on the class instead
of each function. Also added a user.absent to the tearDown to reduce
code duplication.
 2017-03-15 17:16:34 -05:00
Erik Johnson
66596c6d75 Fail test if sudo is missing 2017-03-15 17:15:56 -05:00
Erik Johnson
9b3890b5f2 Fix network test for cases where no network settings are configured 
This allows the test to pass inside a docker container where the
networking is managed by docker and not by the OS' network mangagment
daemon.
 2017-03-15 17:14:29 -05:00
rallytime
148df32604 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-03-15 14:52:07 -06:00
Mike Place
5734e2b0a8 Merge pull request #40027 from terminalmage/py3-tests 
Update git state integration tests for PY3 compatibility
 2017-03-15 13:40:55 -06:00
Erik Johnson
ef110baa99 Update git state integration tests for PY3 compatibility 
Python 3 didn't like some of the stuff that we were doing with
``subprocess.check_call()`` in these tests, so to fix this I have redone
that stuff with calls to functions in the git execution module. In order
to avoid problems with running tests with no global gitconfig, I needed
to add an argument called ``git_opts`` to most of the funcs in the git
execution module (well I didn't *need* to do it to most of the funcs, it
just seemed like we shouldn't only be supporting this argument in a
single function).

This new ``git_opts`` argument is specifically for passing arguments to
the git command itself (not the subcommand). For example, ``git -c
user.name="Foo Bar" commit .....`` is different than running ``git
commit -c user.name="Foo Bar" .....``, because the ``commit`` subcommand
for git also accepts ``-c``.
 2017-03-14 18:07:06 -05:00
rallytime
fe4a208569 Add flaky decorator to flaky rest_tornado test 2017-03-14 16:30:54 -06:00
rallytime
029f28bbd5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/cmdmod.py
 2017-03-14 15:44:38 -06:00
Nicole Thomas
0ec81a4cde Fixup a syntax error 2017-03-14 11:15:02 -06:00
Nicole Thomas
2714676a13 Merge pull request #39746 from terminalmage/pathutils 
Add salt.utils.path
 2017-03-14 11:00:34 -06:00
Erik Johnson
5d84b40bfd Attempt to fix failing grains tests in 2016.3 
The tearDown appears to only be removing the grain if it matches a
specific value. This may be leading to the grain value not being blank
at the time the next test is run.

Instead of only deleting the grain if it matches a specific value,
instead delete all items from that grain to ensure that it is empty for
the next test.
 2017-03-14 11:25:15 -05:00
Pedro Algarvio
410b583a63
The port attribute definition must come first 2017-03-12 18:05:30 +00:00
Pedro Algarvio
992a8c7294
Don't hardcode the webserver port number 2017-03-11 16:00:28 +00:00
Erik Johnson
d2206d1a94 Changes to imports to comport with test suite changes in develop 2017-03-10 11:05:02 -06:00
Erik Johnson
db5208b65a Set up special file_roots for windows symlink test 2017-03-10 11:05:02 -06:00
Erik Johnson
22d5689eb0 Clarify reason for skipping test 2017-03-10 11:05:02 -06:00
twangboy
05cca8b72d Add filerserver test to whitelist, skip symlink test 2017-03-10 11:05:02 -06:00
Mike Place
bbf4eacbba Merge pull request #39930 from s0undt3ch/features/py3 
Moar Py3 and a fix for #38121
 2017-03-09 17:25:01 -07:00
rallytime
4a52cca926 Pylint fixes 2017-03-09 14:55:33 -07:00
Pedro Algarvio
4627c4ea6d Code cleanup and make sure the beacons config file is deleted after testing 
Conflicts:
  - tests/integration/modules/beacons.py
 2017-03-09 13:35:16 -07:00
rallytime
e7fa367548 [develop] Fix pylint error 2017-03-09 13:04:51 -07:00
Pedro Algarvio
50e51b5b9d The beacons configuration is now a list. Handle it! 2017-03-09 13:00:41 -07:00
Pedro Algarvio
680bbec79f
The beacons configuration is now a list. Handle it! 2017-03-09 19:31:13 +00:00
Pedro Algarvio
dd53f055b9
Code cleanup and make sure the beacons config file is deleted after testing 2017-03-09 19:29:16 +00:00
Pedro Algarvio
42065350f1
Catch and handle tornado.iostream.StreamClosedError exceptions 2017-03-09 19:29:16 +00:00
Nicole Thomas
2f0f7cd224 Merge pull request #39897 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-03-09 09:03:46 -07:00
rallytime
c6cfac7678 Pylint fix 2017-03-08 16:24:03 -07:00
Pedro Algarvio
51c5558b32
This should no longer hang 2017-03-08 20:43:36 +00:00
Pedro Algarvio
0b41b92d7d
Use salt.utils.versions instead of distutils.version 2017-03-08 19:22:33 +00:00
Pedro Algarvio
06c063a609
Test assertion cannot be done in the callback context 2017-03-08 18:34:34 +00:00
Pedro Algarvio
b58241648a
Use the tests support paths module 2017-03-08 18:34:34 +00:00
Pedro Algarvio
7fffd93b50
Don't pollute the repo tests state tree 2017-03-08 18:34:33 +00:00
Pedro Algarvio
b391a4eb5b
Supervisord does not work under Python 3 2017-03-08 18:34:33 +00:00
Pedro Algarvio
e2e303e724
Minor changes to paths 2017-03-08 18:34:32 +00:00
Pedro Algarvio
712b81e0c1
supervisor does not run against py3. Use pep8 for the tests. 2017-03-08 18:34:32 +00:00
Pedro Algarvio
07d0a5ed20
Cleanup after ourselves 2017-03-08 18:34:32 +00:00
Pedro Algarvio
c436d9f2f6
This no longer applies. 2017-03-08 18:34:31 +00:00
rallytime
4fc9b5484b Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/pillar/makostack.py
  - tests/integration/client/test_runner.py
  - tests/integration/states/test_file.py
 2017-03-08 09:04:26 -07:00
Pedro Algarvio
7dc6b64689
No need to call .keys() when iterating a dictionary 2017-03-06 14:42:31 +00:00
Pedro Algarvio
ffec7dc299
Lint fixes 2017-03-06 14:35:16 +00:00
Mike Place
3341e4e202 Merge pull request #39492 from whiteinge/full_return-arg 
Add full_return arg to LocalClient and RunnerClient
 2017-03-04 09:14:17 -07:00
Mike Place
c10abec6d3 Merge pull request #39797 from twangboy/win_fix_test_git 
Fix test_worktree_add_rm test for Windows
 2017-03-04 09:12:12 -07:00
Pedro Algarvio
adacf4cc28
Don't expect any ordering from sets!!!!! 2017-03-03 18:31:11 +00:00
twangboy
2a6e61a42e Add encode for Py3 compatability 2017-03-03 10:53:12 -07:00
twangboy
54891a57b1 Fix type in second worktree_path 2017-03-03 10:24:28 -07:00
Pedro Algarvio
e180f1e913
Normalize the mode 2017-03-03 15:15:13 +00:00
twangboy
25938ebc8e Fix test_add_user_to_group for Windows 2017-03-02 15:40:22 -07:00
twangboy
ef53ec7efe Fix test_worktree_add_rm test for Windows 2017-03-02 14:37:53 -07:00
Pedro Algarvio
5b5a6ebbe8
Minor code cleanup 2017-03-02 19:58:10 +00:00
Pedro Algarvio
5e3309d5f8
Let's use the skip_if_not_root decorator instead 2017-03-02 19:58:10 +00:00
Pedro Algarvio
2f3d0b0b81
These are not destructive tests 2017-03-02 19:58:10 +00:00
Pedro Algarvio
80002276c2
These tests are not destructive 2017-03-02 19:58:10 +00:00
Pedro Algarvio
519a3f689e
These tests are not destructive 2017-03-02 19:56:06 +00:00
Pedro Algarvio
31df825a1c
Set the ssh_log_file relative 2017-03-02 19:56:06 +00:00
Pedro Algarvio
fc501e93ac
Remove deprecated options 2017-03-02 19:56:05 +00:00
Pedro Algarvio
7b4d849540
Moved some test supporting modules to tests/support 
Previously they were in tests/utils which also had test case modules.
 2017-03-02 19:56:05 +00:00
Pedro Algarvio
979090d225
We need bytes under Py3 to compute the hash 2017-03-02 19:56:04 +00:00
Seth House
c25ffd5d2e Add LocalClient and RunnerClient full_return tests 2017-03-02 11:46:27 -07:00
Mike Place
9f70ad7164 Merge pull request #39472 from whiteinge/_reformat_low-update 
Update _reformat_low to not run kwarg dicts through parse_input
 2017-03-02 10:46:19 -07:00
Shane Lee
eb6d317289 Merge branch 'develop' into win_fix_renderers_tests 2017-03-02 10:29:36 -07:00
Mike Place
555f1473f6 Merge pull request #39788 from cachedout/disable_api_test 
Disable one API test that is flaky
 2017-03-02 09:17:31 -07:00
Mike Place
523e377b33
Disable one API test that is flaky 2017-03-02 09:16:43 -07:00
twangboy
ad654abc20 Clarify the reason for the while loop 2017-03-01 14:00:06 -07:00
twangboy
25b6d221c4 Fix ext_grains and ext_modules tests for Windows 2017-03-01 14:00:06 -07:00
Mike Place
517842a339 Merge pull request #39696 from twangboy/win_fix_returners_tests 
Fix job cache tests, add librato return tests
 2017-03-01 10:24:59 -07:00
Erik Johnson
64db0b8563 Add integration tests for remote file sources 2017-03-01 10:57:06 -06:00
Mike Place
33e40c94e4
Fix docs test for #39753 2017-03-01 09:06:17 -07:00
Pedro Algarvio
a78c037a5f
PyLint, no its not a repeated keyword! 2017-03-01 01:33:08 +00:00
Pedro Algarvio
4f425e596b
Don't assert, just fail 2017-03-01 01:33:08 +00:00
Pedro Algarvio
bb60e5010c
Redundant 2017-03-01 01:33:08 +00:00
Pedro Algarvio
40a64191a1
Absolute imports and A LOT of code cleanup. 2017-03-01 01:33:07 +00:00
twangboy
037dfb3ece Fix lint error 2017-02-28 15:56:06 -07:00
Pedro Algarvio
3beb3fb801
Move whatever we need from salttesting to salt. 
Let's drop the salttesting dependency cycle.
 2017-02-28 22:52:49 +00:00
Pedro Algarvio
08804932c3
Using pytest start_daemon 2017-02-28 22:52:48 +00:00
Pedro Algarvio
1daa2e24cd
Moved some test supporting modules to tests/support 
Previously they were in tests/utils which also had test case modules.
 2017-02-28 22:52:48 +00:00
Pedro Algarvio
7278a6c868
You need to pass a list. How did this ever pass?! 2017-02-28 22:52:48 +00:00
Mike Place
a73a5f9c1f Merge pull request #39646 from terminalmage/zh921 
Handle deprecation of passing string args to load_args_and_kwargs
 2017-02-28 14:59:33 -07:00
Nicole Thomas
8809d33674 Merge pull request #39701 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-02-28 12:50:10 -07:00
Erik Johnson
7b958fb389 Add options to skip fileserver/git_pillar preflight checks 
This commit also modifies the master config for the test suite to use
this new option, so that a missing GitPython/Pygit2 will not crash the
test suite's master. This should make the test suite run smoother by
only negatively impacting those tests which require the pillar data
provided by git_pillar, when a valid provider is not available.
 2017-02-27 20:21:53 -06:00
rallytime
b4366103a6 Merge branch '2016.11' into 'develop' 
Conflicts:
  - .pylintrc
  - .testing.pylintrc
  - salt/fileclient.py
  - salt/minion.py
  - salt/modules/docker.py
  - salt/modules/win_iis.py
  - salt/states/docker.py
  - salt/states/file.py
  - salt/utils/__init__.py
  - tests/integration/modules/test_sysmod.py
 2017-02-27 15:11:37 -07:00
twangboy
b434523a51 Fix job cache tests, add librato return tests 2017-02-27 13:26:42 -07:00
Mike Place
b6dea5efb9
Correct small bug with docs test. 2017-02-27 09:59:25 -07:00
Erik Johnson
5a3c099e4f Rewrite the tests_valid_docs test 
This uses a function in the runtests_helpers custom module to perform
all the logic, and only returns what failed the test. This saves us from
having to return the entire contents of sys.doc (as well as log all of
the function calls), and also removes the need to run sys.doc in batches
to get around the "max message size" issue.
 2017-02-26 12:21:00 -06:00
Erik Johnson
9f6d08d606 Update tests which used string kwargs 2017-02-25 20:11:06 -06:00