1 |
commit: f5afa7c88cf80d3d36976a2a38d7fcdfe677090d |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Thu Apr 30 01:13:42 2020 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Apr 30 01:17:34 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5afa7c8 |
7 |
|
8 |
app-admin/salt-3000.2-r1: revbump, fix tests, add missing dep |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/files/salt-3000.2-tests.patch | 18 ++++++++++++++++++ |
15 |
.../salt/{salt-3000.2.ebuild => salt-3000.2-r1.ebuild} | 2 ++ |
16 |
2 files changed, 20 insertions(+) |
17 |
|
18 |
diff --git a/app-admin/salt/files/salt-3000.2-tests.patch b/app-admin/salt/files/salt-3000.2-tests.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..a562dee5bf9 |
21 |
--- /dev/null |
22 |
+++ b/app-admin/salt/files/salt-3000.2-tests.patch |
23 |
@@ -0,0 +1,18 @@ |
24 |
+--- salt-3000.2.orig/tests/unit/utils/test_verify.py 2020-04-29 16:57:02.775635698 -0700 |
25 |
++++ salt-3000.2/tests/unit/utils/test_verify.py 2020-04-29 16:57:58.042282147 -0700 |
26 |
+@@ -324,6 +324,7 @@ |
27 |
+ self.assertTrue(os.path.exists(path)) |
28 |
+ |
29 |
+ |
30 |
++@skipIf(True, "breaks under sandbox") |
31 |
+ class TestCleanPath(TestCase): |
32 |
+ ''' |
33 |
+ salt.utils.clean_path works as expected |
34 |
+@@ -366,6 +367,7 @@ |
35 |
+ raise ctypes.WinError() |
36 |
+ |
37 |
+ |
38 |
++@skipIf(True, "breaks under sandbox") |
39 |
+ @skipIf(six.PY2 and salt.utils.platform.is_windows(), 'Skipped on windows py2') |
40 |
+ class TestCleanPathLink(TestCase): |
41 |
+ ''' |
42 |
|
43 |
diff --git a/app-admin/salt/salt-3000.2.ebuild b/app-admin/salt/salt-3000.2-r1.ebuild |
44 |
similarity index 98% |
45 |
rename from app-admin/salt/salt-3000.2.ebuild |
46 |
rename to app-admin/salt/salt-3000.2-r1.ebuild |
47 |
index 376575e7ccf..100dafe7754 100644 |
48 |
--- a/app-admin/salt/salt-3000.2.ebuild |
49 |
+++ b/app-admin/salt/salt-3000.2-r1.ebuild |
50 |
@@ -29,6 +29,7 @@ IUSE="cheetah cherrypy ldap libcloud libvirt genshi gnupg keyring mako |
51 |
|
52 |
RDEPEND=" |
53 |
sys-apps/pciutils |
54 |
+ dev-python/distro[${PYTHON_USEDEP}] |
55 |
dev-python/jinja[${PYTHON_USEDEP}] |
56 |
dev-python/libnacl[${PYTHON_USEDEP}] |
57 |
>=dev-python/msgpack-0.5[${PYTHON_USEDEP}] |
58 |
@@ -101,6 +102,7 @@ PATCHES=( |
59 |
"${FILESDIR}/salt-2017.7.0-dont-realpath-tmpdir.patch" |
60 |
"${FILESDIR}/salt-2019.2.0-skip-tests-that-oom-machine.patch" |
61 |
"${FILESDIR}/salt-3000.1-tests.patch" |
62 |
+ "${FILESDIR}/salt-3000.2-tests.patch" |
63 |
) |
64 |
|
65 |
python_prepare() { |