* Unit test fix:
- fix-test_multiprocessing.py-call-to-psutils.patch
Thomas Goirand
8 years ago
| 6 | 6 |
* glance-api depends on adduser to avoid a lintian warning.
|
| 7 | 7 |
* Update namespaces for config file generation.
|
| 8 | 8 |
* Fixed debian/copyright ordering and years.
|
|
9 |
* Unit test fix:
|
|
10 |
- fix-test_multiprocessing.py-call-to-psutils.patch
|
| 9 | 11 |
|
| 10 | 12 |
-- Thomas Goirand <zigo@debian.org> Tue, 08 Dec 2015 09:26:10 +0100
|
| 11 | 13 |
|
|
0 |
Description: Fix call to psutils
|
|
1 |
Author: Thomas Goirand <zigo@debian.org>
|
|
2 |
Forwarded: no
|
|
3 |
Last-Update: 2016-01-22
|
|
4 |
|
|
5 |
diff --git a/glance/tests/functional/test_reload.py b/glance/tests/functional/test_reload.py
|
|
6 |
index 6be842e..6a1ea0d 100644
|
|
7 |
--- a/glance/tests/functional/test_reload.py
|
|
8 |
+++ b/glance/tests/functional/test_reload.py
|
|
9 |
@@ -75,7 +75,7 @@ class TestReload(functional.FunctionalTest):
|
|
10 |
pid = None
|
|
11 |
pid = self._get_parent(server)
|
|
12 |
process = psutil.Process(pid)
|
|
13 |
- children = process.get_children()
|
|
14 |
+ children = process.children()
|
|
15 |
pids = set()
|
|
16 |
for child in children:
|
|
17 |
pids.add(child.pid)
|
|
18 |
diff --git a/glance/tests/functional/v1/test_multiprocessing.py b/glance/tests/functional/v1/test_multiprocessing.py
|
|
19 |
index 090e0c5..6a6b503 100644
|
|
20 |
--- a/glance/tests/functional/v1/test_multiprocessing.py
|
|
21 |
+++ b/glance/tests/functional/v1/test_multiprocessing.py
|
|
22 |
@@ -47,7 +47,7 @@ class TestMultiprocessing(functional.FunctionalTest):
|
|
23 |
api_pid = self.api_server.process_pid
|
|
24 |
process = psutil.Process(api_pid)
|
|
25 |
|
|
26 |
- children = process.get_children()
|
|
27 |
+ children = process.children()
|
|
28 |
pids = [str(child.pid) for child in children]
|
|
29 |
return pids
|
|
30 |
|
| 0 | 0 |
sql_conn-registry.patch
|
| 1 | 1 |
fixes-unban-routes-2.0.patch
|
| 2 | 2 |
default-config.patch
|
|
3 |
fix-test_multiprocessing.py-call-to-psutils.patch
|