Commit History

Author SHA1 Message Date
  Pedro Algarvio fc77ed0030 Mark slow tests 4 years ago
  Pedro Algarvio b51ae27bc7 Replace `@destructiveTest` with `@pytest.mark.destructive_test` 4 years ago
  Pedro Algarvio 02ae4d0724 Replace `@skip_if_not_root` with `@pytest.mark.skip_if_not_root` 4 years ago
  Pedro Algarvio 81dedf0731 Revert "Skip slowest tests" 4 years ago
  Wayne Werner 332f129e90 Skip slowest tests 4 years ago
  Pedro Algarvio 6ba04cc7da Add windows test whitelisting as pytest markers 4 years ago
  Blacken Salt 0b2a5613b3 Blacken salt 4 years ago
  ch3ll fdeae1f0e1 Use virtualenv 20.0.10 for macosx tests 4 years ago
  ch3ll 67c5ebf578 Merge remote branch 'upstream/master' into mf-master 5 years ago
  Pedro Algarvio 62fbf2f14a Make sure the environ is reset no matter what 6 years ago
  ch3ll 60a518cb09 Merge branch 'upstream/master' into mf-master 5 years ago
  Pedro Algarvio df4acd3978 Try to use the same version matching python binary 5 years ago
  Ch3LL 355551c83b Merge remote-tracking branch 2018.3 into master 5 years ago
  Daniel A. Wozniak d2f98cacea Fix issue 54755 and add regression tests 5 years ago
  Gareth J. Greenaway 1d4e228f15 Updating various skips for tests to only skip if OS is OS X and Python is Python2. 5 years ago
  Gareth J. Greenaway 87888778fe Skip integration.states.test_file.FileTest.test_issue_11003_immutable_lazy_proxy_sum and 5 years ago
  Gareth J. Greenaway 1741bb053b Adding some timeouts to see if it helps the tests pass on OS X. 5 years ago
  Gareth J. Greenaway e03ab81b99 Using salt.utils.path.which to find false, on OSX it lives under /usr/bin/ 5 years ago
  Wayne Werner 7ab295c826 Use RUNTIME_VARS for bin/true and bin/false paths 5 years ago
  Pedro Algarvio da2e147e54 Always cleanup the changed environ 5 years ago
  Pedro Algarvio 3e9d22abb1 Merge branch '2017.7' into 2018.3 5 years ago
  Pedro Algarvio ff6d3c6dae We don't need to be root to run these tests 5 years ago
  Pedro Algarvio ea9d2460f0 We must also provide `venv_bin` when running within a virtualenv 5 years ago
  Pedro Algarvio 31e91b03bb Fix pip tests, in particular under windows 5 years ago
  Pedro Algarvio 7b173523d8 More insight(context) on failure reports 5 years ago
  Pedro Algarvio ff12fefc72 Always cleanup the changed environ 5 years ago
  Pedro Algarvio 0cbed99dc1 Merge branch '2017.7' into 2018.3 5 years ago
  Pedro Algarvio b113860359 We don't need to be root to run these tests 5 years ago
  Pedro Algarvio 561183d6c0 We must also provide `venv_bin` when running within a virtualenv 5 years ago
  Pedro Algarvio 15819df6da Fix pip tests, in particular under windows 5 years ago