rallytime
d8e7c47a05
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- tests/support/case.py
2018-11-12 16:11:17 -05:00
Daniel A. Wozniak
794ba17c94
Reset date and time after changing
2018-11-12 00:43:22 -07:00
Gareth J. Greenaway
8885d1ff3d
Merge branch '2018.3' into 41342_beacon_state_module_fixes
2018-11-02 12:08:19 -07:00
lomeroe
0e011ad805
add runTest method to class for PY2
2018-11-02 08:03:43 -05:00
lomeroe
377ec095ab
add a test for #47784
2018-11-02 08:03:43 -05:00
lomeroe
0a14505e21
change backslashes in comment string to fix lint error
2018-11-02 08:03:43 -05:00
lomeroe
02181d385a
add fix/test for #50079
...
ADML display names that have a single match in each Computer/User policy
would not work with the "short" display name, requiring either the
"long" name or the explicit policy name
2018-11-02 08:03:43 -05:00
lomeroe
05f29511a4
more lint fixes
2018-11-02 08:03:43 -05:00
lomeroe
94b33350a8
lint fixes in test
2018-11-02 08:03:43 -05:00
lomeroe
2a79626538
update test to actually work
...
update lgpo module to catch another possible case of multiple ADML names
2018-11-02 08:03:43 -05:00
lomeroe
42840ecd9b
add missing comma in function call
2018-11-02 08:03:43 -05:00
lomeroe
c283f50074
Log a warning message instead of an exception when a SID cannot be
...
converted to a username (for user rights assignments)
Add a module test file
2018-11-02 08:03:43 -05: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
Mike Place
f22630eacb
Merge branch '2018.3' into win_pkg_redux
2018-10-18 13:06:31 +02:00
rallytime
8609064f30
Update old utils paths to use new paths
2018-10-17 10:24:26 -04:00
rallytime
a984ad8b3d
Merge branch '2017.7' into '2018.3'
...
No conflicts.
2018-10-17 10:21:42 -04:00
Nicole Thomas
7ec3840d25
Merge pull request #49794 from twangboy/fix_groupadd_test
...
Fix possible issue with test_groupadd
2018-10-17 10:20:33 -04:00
Daniel A. Wozniak
9f5722a71d
The test is not a flush problem
2018-10-16 22:22:49 -07:00
Daniel A. Wozniak
128c2c5423
Flush and sync file contents
2018-10-16 12:40:23 -07:00
Daniel Wozniak
fef7669a15
Merge pull request #49809 from Ch3LL/win_pkg_flaky
...
Add additional asserts to help investigate test_win_pkg failure
2018-10-13 11:00:08 -07:00
Daniel A. Wozniak
beaab2a05a
Fix win_pkg test
...
Bugfix in file_list cache. The file_list cache age could be a negative
number meaning the file_list cache can get used in tests even though the
cache timeout is set to 0 for test suite runs.
2018-10-11 15:47:44 -07:00
rallytime
df11c396ec
Skip pillar refresh test
...
This test is flaky and fails intermittently, even with the `flaky` decoractor.
Skipping for now until we can debug further.
2018-10-09 10:26:45 -04:00
Daniel A. Wozniak
e5ea3f1956
Try running fsync to avoid fs caching race condition
2018-10-06 12:49:49 -07:00
Daniel A. Wozniak
1005b91690
Debug win_pkg
2018-10-04 15:34:10 -07:00
Ch3LL
9dce5cc7ba
Fix the assertion message order
2018-10-04 12:10:45 -04:00
Ch3LL
18e9a2831a
Add additional asserts to help investigate test_win_pkg failure
2018-10-04 12:03:06 -04:00
rallytime
b53c3e695a
Update old utils paths to use new utils paths
2018-10-02 15:12:58 -04:00
rallytime
a65c60d862
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/state.py
- salt/utils/hashutils.py
- tests/integration/modules/test_state.py
2018-10-02 15:09:51 -04:00
Erik Johnson
8a9945efd2
Update test docstring to reflect switch to using SHA1
2018-09-28 10:05:18 -05:00
Erik Johnson
dca90d7bde
Skip parallel states test on Windows until we can get it to work
2018-09-27 12:16:43 -05:00
Erik Johnson
5a110677b9
Add additional info to the assert to aid in troubleshooting
2018-09-26 14:50:35 -05:00
Erik Johnson
cb19086020
Remove/replace unnecessary setUp/tearDown
...
The setUp only needs to run at the beginning so it can be a setUpClass,
and the tearDown logic only applied to a single test and should not be
run after each test.
2018-09-26 14:50:35 -05:00
Erik Johnson
b3e9678fd9
Fix parallel states with long ID dec or name
...
The cache files used for these are based on the state's tag, so longer
ID decs or names will cause errors when the filename's length exceeds
the max allowed by the kernel.
This fixes these errors by taking (up to) the first 32 chars of the
result of base64-encoding the tag, and using that as the parallel cache
filename.
2018-09-26 14:50:35 -05:00
twangboy
3d3b67d7d0
Gate for Windows
2018-09-26 13:10:38 -06:00
twangboy
decfa523d1
Check value of result instead of entire dict
2018-09-26 13:06:30 -06:00
Daniel A. Wozniak
a44b37a510
Merge remote-tracking branch 'saltstack/2018.3' into whitelist
2018-09-21 15:39:45 -07:00
Daniel A. Wozniak
90489709ce
Add some debug info to assert
2018-09-21 09:05:12 -07:00
Daniel A. Wozniak
0ec1e1eca3
Increase timeout on flaky test
2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
6ae924b85f
Skip test that is not applicable on windows
2018-09-19 11:21:13 -06:00
Daniel A. Wozniak
598020079f
Increase timeout on flaky test
2018-09-19 11:21:12 -06:00
twangboy
3600467a04
Fix some try/except blocks, mark a lazy test
2018-09-18 10:56:51 -06:00
Daniel Wozniak
2e1bf1335a
Merge branch '2018.3' into add_whitelist
2018-09-16 10:49:21 -06:00
rallytime
186f57eede
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- salt/modules/network.py
2018-09-13 17:11:18 -04:00
rallytime
be8a187b4d
Mark grains test as flaky
2018-09-13 16:17:02 +00:00
Daniel Wozniak
f908cde7f7
Merge branch '2018.3' into add_whitelist
2018-09-12 10:04:00 -06:00
rallytime
19598d8802
Merge branch '2017.7' into '2018.3'
...
Conflicts:
- pkg/osx/build_env.sh
- salt/cloud/clouds/proxmox.py
- salt/minion.py
- salt/modules/win_lgpo.py
- salt/netapi/rest_tornado/__init__.py
- salt/netapi/rest_tornado/saltnado.py
- salt/returners/local_cache.py
- salt/returners/rawfile_json.py
- salt/utils/minions.py
2018-09-11 12:51:52 -04:00
Daniel A. Wozniak
bee29024f5
Make windows file remove return like others
2018-09-11 08:37:46 -07:00
Erik Johnson
729dc0819f
Kill bare excepts with fire
...
These prevent the signal handlers from shutting down a process via a
raising a SystemExit. They are ticking time bombs of race conditions
that leave processes running when daemons are shut down or restarted.
Friends don't let friends use bare excepts.
2018-09-10 13:19:03 -06:00
Daniel A Wozniak
ccbcb5588a
Add more tests to whitelist for Windows
2018-09-10 09:34:27 -07:00
Daniel A. Wozniak
dbe40df7de
Increase timeout for flaky git test
2018-09-07 16:46:34 -07:00
