Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move fileclient tests to tests/integration/fileserver/fileclient_test.py #39081

Merged
merged 1 commit into from Jan 31, 2017

Conversation

terminalmage
Copy link
Contributor

Being in the root of tests/integration/, these were not being run in
jenkins and would only run if executed manually using the -n flag in
runtests.py.

Being in the root of tests/integration/, these were not being run in
jenkins and would only run if executed manually using the -n flag in
runtests.py.
@rallytime rallytime merged commit bcee3d1 into saltstack:2016.3 Jan 31, 2017
gitebra pushed a commit to gitebra/salt that referenced this pull request Feb 2, 2017
* upstream/develop: (37 commits)
  MANY dunder variable fixes for proxies + proxy keepalive from @mirceaulinic (saltstack#38829)
  Missing colon
  Fixing a weird edge case when using salt syndics and targetting via pillar.  Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use.
  correct checking of policy_class to compare with lower() version of the specified string (saltstack#39084)
  Backport saltstack#38779 to 2016.11 (saltstack#39089)
  update adml text search to use 'starts-with' as some policies text has trailing spaces (saltstack#39090)
  correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (saltstack#39088)
  use the pillar kwarg explicitely
  add ability to override pillar data during state.sls_id run.
  [Bugfix] Fix state x509.crl_managed
  Check if data['return'] is dict type
  add debug logging for batch vars
  Don't fail test if data is empty
  Account for trimmed value in 'salt -d' output
  Run test_valid_docs in batches
  Update primary bonding option in rh_ip.py (saltstack#39069)
  Update primary bonding option in debian_ip.py (saltstack#39068)
  Add a bunch of missing doc module references
  Move fileclient tests to tests/integration/fileserver/fileclient_test.py (saltstack#39081)
  _in_range_inclusive class method incorrectly called isinstance
  ...
@terminalmage terminalmage deleted the move-tests branch April 25, 2017 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants