1 |
commit: 2a52395d64188e230da2db88bcc7a9028b27a07b |
2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
3 |
AuthorDate: Wed Feb 27 21:40:05 2019 +0000 |
4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Feb 27 21:40:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a52395d |
7 |
|
8 |
app-admin/salt: Version bump to 2018.3.4 |
9 |
|
10 |
Copyright: Sony Interactive Entertainment Inc. |
11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
12 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
13 |
|
14 |
app-admin/salt/Manifest | 2 +- |
15 |
app-admin/salt/files/salt-2018.3.4-tests.patch | 76 ++++++++++++++++++++++ |
16 |
.../{salt-2018.3.3.ebuild => salt-2018.3.4.ebuild} | 4 +- |
17 |
3 files changed, 79 insertions(+), 3 deletions(-) |
18 |
|
19 |
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest |
20 |
index 042f649e584..1ade6a74b5a 100644 |
21 |
--- a/app-admin/salt/Manifest |
22 |
+++ b/app-admin/salt/Manifest |
23 |
@@ -1,3 +1,3 @@ |
24 |
DIST salt-2016.11.10.tar.gz 10058200 BLAKE2B 4b6a42f6bf56421bc19458686ec23a1f945ceeb68b4ce7059fde036ba98d677fc8b61cb0f0c6ab249304b2f07d1b0250f6b91e7c443e12868649bf88f4d44d43 SHA512 e767e2c4c20e3a49a748b2699e4c640610280c0ba1c5955d94daffc7c36991ee632f02a50e338c65b35da146e234c36cc732214174b9bc5cbd62316b9ee40c28 |
25 |
DIST salt-2017.7.8.tar.gz 12060430 BLAKE2B b2dde1b6f43bbb9b9db29b70dfd57591ae0e490e35ec7f4895b68b444ff77f9e997321d73697f791d345756abf451f11891b5f78a97c537c35dfe8bd24c43bbc SHA512 1e5123ee3dc194a33cf5da1e68a0419230b2b4eea26e7f66bf2d64754f0dbef9012abfbd498015f6b675725e580d72abf13c151b106639597337498b1fd42238 |
26 |
-DIST salt-2018.3.3.tar.gz 13953724 BLAKE2B 353f4ee23747f02200116157823b038fc8d361fb88f5f531a147d6c81497ba3f6cebf5a5abf4ac7f81199439bbf8a9cc46e03cdd76bfbb3c39f2b31a6158ca5c SHA512 f00ed83d5ec9d4767d7215fae8569ec560db61a0c8ded17469026e682e367c19811d33c6c53590a275ee24ad897a0eac09d8fde8ae9320d8706d6459ff3cc6da |
27 |
+DIST salt-2018.3.4.tar.gz 14404085 BLAKE2B 932b30b1ba60aefd3a6874a8ebe4cb6c469d82e31f6acdbe8a5641d09e3316796b5403ef803a355cec6255c1aede8bac3b66af179bd1bbaa5418c7076229cef9 SHA512 f17e06fdbf4741f231d9e769be57de4f6079e9283881b4bafa0d23928d7626a1f9c02b9f49c654b29c3e6ee8ed3d3ddf42c21baecef158ad63a97dc87895b21b |
28 |
|
29 |
diff --git a/app-admin/salt/files/salt-2018.3.4-tests.patch b/app-admin/salt/files/salt-2018.3.4-tests.patch |
30 |
new file mode 100644 |
31 |
index 00000000000..ac3dbb84534 |
32 |
--- /dev/null |
33 |
+++ b/app-admin/salt/files/salt-2018.3.4-tests.patch |
34 |
@@ -0,0 +1,76 @@ |
35 |
+diff --git a/tests/unit/grains/test_core.py b/tests/unit/grains/test_core.py |
36 |
+index 3874b0001c..40304075eb 100644 |
37 |
+--- a/tests/unit/grains/test_core.py |
38 |
++++ b/tests/unit/grains/test_core.py |
39 |
+@@ -685,22 +685,6 @@ class CoreGrainsTestCase(TestCase, LoaderModuleMockMixin): |
40 |
+ 'Docker' |
41 |
+ ) |
42 |
+ |
43 |
+- @skipIf(salt.utils.platform.is_windows(), 'System is Windows') |
44 |
+- def test_xen_virtual(self): |
45 |
+- ''' |
46 |
+- Test if OS grains are parsed correctly in Ubuntu Xenial Xerus |
47 |
+- ''' |
48 |
+- with patch.object(os.path, 'isfile', MagicMock(return_value=False)): |
49 |
+- with patch.dict(core.__salt__, {'cmd.run': MagicMock(return_value='')}), \ |
50 |
+- patch.object(os.path, |
51 |
+- 'isfile', |
52 |
+- MagicMock(side_effect=lambda x: True if x == '/sys/bus/xen/drivers/xenconsole' else False)): |
53 |
+- log.debug('Testing Xen') |
54 |
+- self.assertEqual( |
55 |
+- core._virtual({'kernel': 'Linux'}).get('virtual_subtype'), |
56 |
+- 'Xen PV DomU' |
57 |
+- ) |
58 |
+- |
59 |
+ def _check_ipaddress(self, value, ip_v): |
60 |
+ ''' |
61 |
+ check if ip address in a list is valid |
62 |
+diff --git a/tests/unit/utils/test_asynchronous.py b/tests/unit/utils/test_asynchronous.py |
63 |
+index 694a7aebfe..9e22c278e9 100644 |
64 |
+--- a/tests/unit/utils/test_asynchronous.py |
65 |
++++ b/tests/unit/utils/test_asynchronous.py |
66 |
+@@ -35,19 +35,6 @@ class HelperB(object): |
67 |
+ |
68 |
+ |
69 |
+ class TestSyncWrapper(AsyncTestCase): |
70 |
+- @tornado.testing.gen_test |
71 |
+- def test_helpers(self): |
72 |
+- ''' |
73 |
+- Test that the helper classes do what we expect within a regular asynchronous env |
74 |
+- ''' |
75 |
+- ha = HelperA() |
76 |
+- ret = yield ha.sleep() |
77 |
+- self.assertTrue(ret) |
78 |
+- |
79 |
+- hb = HelperB() |
80 |
+- ret = yield hb.sleep() |
81 |
+- self.assertFalse(ret) |
82 |
+- |
83 |
+ def test_basic_wrap(self): |
84 |
+ ''' |
85 |
+ Test that we can wrap an asynchronous caller. |
86 |
+@@ -55,24 +42,3 @@ class TestSyncWrapper(AsyncTestCase): |
87 |
+ sync = asynchronous.SyncWrapper(HelperA) |
88 |
+ ret = sync.sleep() |
89 |
+ self.assertTrue(ret) |
90 |
+- |
91 |
+- def test_double(self): |
92 |
+- ''' |
93 |
+- Test when the asynchronous wrapper object itself creates a wrap of another thing |
94 |
+- |
95 |
+- This works fine since the second wrap is based on the first's IOLoop so we |
96 |
+- don't have to worry about complex start/stop mechanics |
97 |
+- ''' |
98 |
+- sync = asynchronous.SyncWrapper(HelperB) |
99 |
+- ret = sync.sleep() |
100 |
+- self.assertFalse(ret) |
101 |
+- |
102 |
+- def test_double_sameloop(self): |
103 |
+- ''' |
104 |
+- Test asynchronous wrappers initiated from the same IOLoop, to ensure that |
105 |
+- we don't wire up both to the same IOLoop (since it causes MANY problems). |
106 |
+- ''' |
107 |
+- a = asynchronous.SyncWrapper(HelperA) |
108 |
+- sync = asynchronous.SyncWrapper(HelperB, (a,)) |
109 |
+- ret = sync.sleep() |
110 |
+- self.assertFalse(ret) |
111 |
|
112 |
diff --git a/app-admin/salt/salt-2018.3.3.ebuild b/app-admin/salt/salt-2018.3.4.ebuild |
113 |
similarity index 99% |
114 |
rename from app-admin/salt/salt-2018.3.3.ebuild |
115 |
rename to app-admin/salt/salt-2018.3.4.ebuild |
116 |
index deb62df7a93..bf3224ca0de 100644 |
117 |
--- a/app-admin/salt/salt-2018.3.3.ebuild |
118 |
+++ b/app-admin/salt/salt-2018.3.4.ebuild |
119 |
@@ -1,7 +1,7 @@ |
120 |
# Copyright 1999-2019 Gentoo Authors |
121 |
# Distributed under the terms of the GNU General Public License v2 |
122 |
|
123 |
-EAPI=6 |
124 |
+EAPI=7 |
125 |
PYTHON_COMPAT=( python2_7 python3_6 ) |
126 |
|
127 |
inherit eutils systemd distutils-r1 |
128 |
@@ -96,7 +96,7 @@ RESTRICT="x86? ( test )" |
129 |
|
130 |
PATCHES=( |
131 |
"${FILESDIR}/${PN}-2017.7.0-dont-realpath-tmpdir.patch" |
132 |
- "${FILESDIR}/${PN}-2017.7.8-tests.patch" |
133 |
+ "${FILESDIR}/${PN}-2018.3.4-tests.patch" |
134 |
"${FILESDIR}/${PN}-2018.3.2-skip-zeromq-test-that-hangs.patch" |
135 |
) |