Erik Johnson
a35c023fdc
Don't use a decorator that assumes /etc/apt/sources.list.d exists
...
This will make the test fail on most platforms
2019-01-31 19:47:11 -06:00
Erik Johnson
6a62e7912a
Add integration test for architecture support
2019-01-31 16:12:51 -06:00
Pedro Algarvio
d4ab6d815b
Merge branch '2018.3' into fix_test_pkg
2019-01-24 11:39:57 +00:00
Daniel A. Wozniak
a5255f0eb2
Merge remote-tracking branch 'saltstack/2018.3' into issue-50221
2019-01-23 08:26:20 -07:00
Daniel A. Wozniak
c1ea10f090
Fix py3 managed.file test failure
2019-01-22 10:46:32 -07:00
Daniel A. Wozniak
ac978f0647
Fix 50221 regression test on Windows
2019-01-19 18:21:27 -07:00
Daniel A. Wozniak
65f38b5ab2
peserve newlines from pillar data for file.managed
2019-01-19 16:11:49 -07:00
Gareth J. Greenaway
a233dbc79a
Ensuring we can handle a string that contains single quote + an escaped double quote.
2019-01-18 12:45:09 -08:00
twangboy
b91b2c62f5
Backport PR# 50771 to 2018.3 branch
2019-01-16 15:54:17 -07:00
Gareth J. Greenaway
bcf8f06aa4
fixing lint
2018-12-18 16:48:14 -08:00
Gareth J. Greenaway
543ec7bc79
Ensure source_hash returned from get_source_sum is lowercase.
2018-12-18 16:51:26 -07:00
Erik Johnson
be14517c5c
Make x509 tests use tempfiles instead of hard-coding them
...
This keeps us from needing to manually clean them up in the tearDown
2018-12-03 13:13:14 -06:00
Erik Johnson
a394cd76f6
Update file integration tests to use decorator for tempdirs
2018-11-29 09:29:23 -06:00
Gareth J. Greenaway
c2354a9cb1
Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs.
2018-11-01 16:47:02 -07:00
Gareth J. Greenaway
2390f471ce
Adding SaltReturnAssertsMixin back in
2018-11-01 15:22:18 -07:00
Gareth J. Greenaway
677d0908fd
Remove zookeeper reference.
2018-11-01 15:05:42 -07:00
Gareth J. Greenaway
f3dee43bf0
Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format.
2018-11-01 15:02:21 -07:00
Daniel A. Wozniak
b77db48d77
Fix test_managed_file_with_grains_data on Windows
2018-10-23 22:58:09 -07:00
Mike Place
b7d904f4bb
Merge branch '2018.3' into issue-49043
2018-09-30 09:18:54 -05:00
Daniel Wozniak
ed35633a1f
Revert diff newline change
2018-09-28 17:06:36 -07:00
Daniel Wallace
cf5c179fd9
fix test_managed_file_with_grains_data
...
Closes saltstack/salt-jenkins#1121
2018-09-26 14:49:23 -05:00
Daniel A Wozniak
2a901e960d
Fix issue 49043
2018-09-25 23:27:28 -07:00
Daniel A. Wozniak
ed4de6385d
Fix file serialize test
2018-09-19 22:47:07 -06:00
Daniel A. Wozniak
4a54c7c164
Fix file serialize test
2018-09-19 11:21:13 -06:00
Nicole Thomas
e319ecc9f6
Merge pull request #49629 from rallytime/merge-2018.3
...
[2018.3] Merge forward from 2018.3.3 to 2018.3
2018-09-13 10:00:07 -04:00
Gareth J. Greenaway
588f744493
Fixing failing test under python 3.7 causaed by changes to how os.makedirs sets initial permissions.
2018-09-12 14:25:57 -06:00
rallytime
b628ad729b
Merge branch '2018.3.3' into '2018.3'
...
Conflicts:
- tests/integration/states/test_file.py
2018-09-12 12:35:00 -04:00
Nicole Thomas
7042fc0f75
Merge pull request #49580 from garethgreenaway/fixing_failing_test_python_3_7
...
[2018.3] Fixing tests for Python 3.7
2018-09-12 12:33:35 -04:00
Nicole Thomas
e3a14e3535
Merge pull request #49594 from rallytime/bp-49580
...
Back-port #49580 to 2018.3.3
2018-09-10 15:59:40 -04:00
Gareth J. Greenaway
5fee38d1db
Fixes various tests that were failing under python 3.7.
2018-09-10 12:43:55 -04:00
rallytime
5de2245c11
Update old utils paths to use new utils paths
2018-09-10 09:14:24 -04:00
Daniel Wozniak
faafe74a68
Merge branch '2018.3' into m2crypto_test
2018-09-07 22:58:54 -07:00
Gareth J. Greenaway
d2fb68c8ed
Fixes various tests that were failing under python 3.7.
2018-09-07 20:17:00 -07:00
Daniel A. Wozniak
abc9c1acb5
Fix linter issues
2018-09-07 08:03:29 -07:00
Daniel A. Wozniak
8e42384342
Fix multiple issues in x509 module and state
...
Adding a regression test for #49008 and patching the x509 module and
state to make the test pass.
2018-09-07 07:46:10 -07:00
Daniel A. Wozniak
2a521586db
Fix encoding issues in file and x509 states
2018-09-07 07:46:10 -07:00
rallytime
cf508a4a50
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- requirements/opt.txt
- requirements/tests.txt
- salt/modules/win_service.py
- tests/integration/states/test_service.py
2018-09-06 12:08:01 -04:00
Ch3LL
50237e9daf
Skip test_virt and pip_state requirements tests on macosx
2018-09-05 17:49:07 -04:00
Daniel A Wozniak
944f8e96c8
Use salt.utils to ensure string type
2018-08-31 10:21:14 -04:00
Daniel A. Wozniak
6399d035a4
Add dedent that sets line endings
2018-08-31 10:18:55 -04:00
Nicole Thomas
bcc5f1a7c1
Merge pull request #49444 from rallytime/bp-49299
...
Back-port #49299 to 2018.3.3
2018-08-30 14:10:20 -04:00
Daniel A. Wozniak
b8c5a5bb91
Fix string formatting wart in file state tests
2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
19756022be
Fix wart in file state test
2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
ba68388342
Work around cmd.run unicode issues in test for now
...
Cat is missing on windows. I tired unsuccesfully to make this work with
the 'type' command on windows. This is maybe not ideal but it stablizes
the test suite for now.
2018-08-30 10:48:02 -04:00
Daniel A. Wozniak
5fe821978e
File state line ending fixes
2018-08-30 10:44:14 -04:00
rallytime
4939ee3b49
Merge branch '2018.3.3' into '2018.3'
...
Conflicts:
- salt/utils/timed_subprocess.py
- tests/integration/states/test_file.py
2018-08-29 13:13:16 -04:00
twangboy
38009660e4
Add tests
2018-08-28 11:03:33 -06:00
rallytime
ab6cc1c741
Update old utils paths to use new paths
2018-08-28 11:41:38 -04:00
rallytime
ac406c49a7
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/ext/win_inet_pton.py
- salt/pillar/git_pillar.py
- tests/integration/cli/test_batch.py
- tests/integration/modules/test_archive.py
- tests/integration/modules/test_pkg.py
- tests/integration/states/test_file.py
- tests/support/case.py
- tests/whitelist.txt
2018-08-28 11:22:47 -04:00
Daniel A. Wozniak
16ca5b9694
Work around listdir encoding issues on py2 windows
2018-08-28 09:24:16 -04:00
