Merge branch '2017.7.8' into merge-2017.7

This commit is contained in:
rallytime 2018-08-09 08:44:07 -04:00
commit ca82b3d57a
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19

View file

@ -39,7 +39,7 @@ class CompileTest(ModuleCase):
'''
if salt.utils.is_linux() and HAS_LSB_RELEASE:
release = lsb_release.get_distro_information()
if release.get('ID') == 'Debian' and int(release.get('RELEASE', 0)) < 9:
if release.get('ID') == 'Debian' and int(release.get('RELEASE', '0')[0]) < 9:
self.skipTest('This test is flaky on Debian 8. Skipping.')
ret = self.run_function('state.sls', ['issue-10010'])