diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-04-29 18:13:42 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-04-29 18:17:34 -0700 |
| commit | f5afa7c88cf80d3d36976a2a38d7fcdfe677090d (patch) | |
| tree | b8824882c662a14255620173efcba45546dc18bf /app-admin | |
| parent | sys-apps/coreutils: fix sandbox-env-test.patch (diff) | |
| download | gentoo-f5afa7c88cf80d3d36976a2a38d7fcdfe677090d.tar.gz gentoo-f5afa7c88cf80d3d36976a2a38d7fcdfe677090d.tar.bz2 gentoo-f5afa7c88cf80d3d36976a2a38d7fcdfe677090d.zip | |
app-admin/salt-3000.2-r1: revbump, fix tests, add missing dep
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/salt/files/salt-3000.2-tests.patch | 18 | ||||
| -rw-r--r-- | app-admin/salt/salt-3000.2-r1.ebuild (renamed from app-admin/salt/salt-3000.2.ebuild) | 2 |
2 files changed, 20 insertions, 0 deletions
diff --git a/app-admin/salt/files/salt-3000.2-tests.patch b/app-admin/salt/files/salt-3000.2-tests.patch new file mode 100644 index 000000000000..a562dee5bf94 --- /dev/null +++ b/app-admin/salt/files/salt-3000.2-tests.patch @@ -0,0 +1,18 @@ +--- salt-3000.2.orig/tests/unit/utils/test_verify.py 2020-04-29 16:57:02.775635698 -0700 ++++ salt-3000.2/tests/unit/utils/test_verify.py 2020-04-29 16:57:58.042282147 -0700 +@@ -324,6 +324,7 @@ + self.assertTrue(os.path.exists(path)) + + ++@skipIf(True, "breaks under sandbox") + class TestCleanPath(TestCase): + ''' + salt.utils.clean_path works as expected +@@ -366,6 +367,7 @@ + raise ctypes.WinError() + + ++@skipIf(True, "breaks under sandbox") + @skipIf(six.PY2 and salt.utils.platform.is_windows(), 'Skipped on windows py2') + class TestCleanPathLink(TestCase): + ''' diff --git a/app-admin/salt/salt-3000.2.ebuild b/app-admin/salt/salt-3000.2-r1.ebuild index 376575e7ccf4..100dafe7754f 100644 --- a/app-admin/salt/salt-3000.2.ebuild +++ b/app-admin/salt/salt-3000.2-r1.ebuild @@ -29,6 +29,7 @@ IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako RDEPEND=" sys-apps/pciutils + dev-python/distro[${PYTHON_USEDEP}] dev-python/jinja[${PYTHON_USEDEP}] dev-python/libnacl[${PYTHON_USEDEP}] >=dev-python/msgpack-0.5[${PYTHON_USEDEP}] @@ -101,6 +102,7 @@ PATCHES=( "${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" "${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" "${FILESDIR}/salt-3000.1-tests.patch" + "${FILESDIR}/salt-3000.2-tests.patch" ) python_prepare() { |