1
=== modified file 'landscape/lib/tests/test_process.py'
2
--- landscape/lib/tests/test_process.py	2012-10-10 13:32:10 +0000
3
+++ landscape/lib/tests/test_process.py	2016-06-15 17:28:32 +0000
4
@@ -1,4 +1,5 @@
5
1
import unittest
1
import unittest
6
2
import mock
7
2
import os
3
import os
8
3
4
9
4
from landscape.tests.helpers import LandscapeTest
5
from landscape.tests.helpers import LandscapeTest
10
@@ -39,15 +40,14 @@
11
39
        stat = " ".join(stat_array)
40
        stat = " ".join(stat_array)
12
40
        create_file(os.path.join(process_dir, "stat"), stat)
41
        create_file(os.path.join(process_dir, "stat"), stat)
13
41
42
15
42
    def test_missing_process_race(self):
43
    @mock.patch("landscape.lib.process.detect_jiffies", return_value=1)
16
44
    @mock.patch("os.listdir")
17
45
    def test_missing_process_race(self, list_dir_mock, jiffies_mock):
18
43
        """
46
        """
19
44
        We use os.listdir("/proc") to get the list of active processes, if a
47
        We use os.listdir("/proc") to get the list of active processes, if a
20
45
        process ends before we attempt to read the process' information, then
48
        process ends before we attempt to read the process' information, then
21
46
        this should not trigger an error.
49
        this should not trigger an error.
22
47
        """
50
        """
23
48
        listdir_mock = self.mocker.replace("os.listdir")
24
49
        listdir_mock("/proc")
25
50
        self.mocker.result(["12345"])
26
51
51
27
52
        class FakeFile(object):
52
        class FakeFile(object):
28
53
53
29
@@ -67,20 +67,21 @@
30
67
            def close(self):
67
            def close(self):
31
68
                self.closed = True
68
                self.closed = True
32
69
69
35
70
        open_mock = self.mocker.replace("__builtin__.open")
70
        list_dir_mock.return_value = ["12345"]
34
71
        open_mock("/proc/12345/cmdline", "r")
36
72
        fakefile1 = FakeFile("test-binary")
71
        fakefile1 = FakeFile("test-binary")
37
73
        self.mocker.result(fakefile1)
38
74
39
75
        open_mock("/proc/12345/status", "r")
40
76
        fakefile2 = FakeFile(None)
72
        fakefile2 = FakeFile(None)
47
77
        self.mocker.result(fakefile2)
73
48
78
74
        with mock.patch("__builtin__.open", mock.mock_open()) as open_mock:
49
79
        self.mocker.replay()
75
            # This means "return fakefile1, then fakefile2"
50
80
76
            open_mock.side_effect = [fakefile1, fakefile2]
51
81
        process_info = ProcessInformation("/proc")
77
            process_info = ProcessInformation("/proc")
52
82
        processes = list(process_info.get_all_process_info())
78
            processes = list(process_info.get_all_process_info())
53
79
            calls = [
54
80
                mock.call("/proc/12345/cmdline", "r"),
55
81
                mock.call("/proc/12345/status", "r")]
56
82
            open_mock.assert_has_calls(calls)
57
83
        self.assertEqual(processes, [])
83
        self.assertEqual(processes, [])
58
84
        list_dir_mock.assert_called_with("/proc")
59
84
        self.assertTrue(fakefile1.closed)
85
        self.assertTrue(fakefile1.closed)
60
85
        self.assertTrue(fakefile2.closed)
86
        self.assertTrue(fakefile2.closed)
61
86
87
Reviewer	Review Type	Date Requested	Status
🤖 Landscape Builder	test results		Approve on 2016-06-15
Free Ekanayaka (community)		2016-06-15	Approve on 2016-06-15
Benji York (community)		2016-06-15	Approve on 2016-06-15
Review via email: mp+297496@code.launchpad.net
1	=== modified file 'landscape/lib/tests/test_process.py'
2	--- landscape/lib/tests/test_process.py 2012-10-10 13:32:10 +0000
3	+++ landscape/lib/tests/test_process.py 2016-06-15 17:28:32 +0000
4	@@ -1,4 +1,5 @@
5	1	import unittest	1	import unittest
6			2	import mock
7	2	import os	3	import os
8	3		4
9	4	from landscape.tests.helpers import LandscapeTest	5	from landscape.tests.helpers import LandscapeTest
10	@@ -39,15 +40,14 @@
11	39	stat = " ".join(stat_array)	40	stat = " ".join(stat_array)
12	40	create_file(os.path.join(process_dir, "stat"), stat)	41	create_file(os.path.join(process_dir, "stat"), stat)
13	41		42
15	42	def test_missing_process_race(self):	43	@mock.patch("landscape.lib.process.detect_jiffies", return_value=1)
16			44	@mock.patch("os.listdir")
17			45	def test_missing_process_race(self, list_dir_mock, jiffies_mock):
18	43	"""	46	"""
19	44	We use os.listdir("/proc") to get the list of active processes, if a	47	We use os.listdir("/proc") to get the list of active processes, if a
20	45	process ends before we attempt to read the process' information, then	48	process ends before we attempt to read the process' information, then
21	46	this should not trigger an error.	49	this should not trigger an error.
22	47	"""	50	"""
23	48	listdir_mock = self.mocker.replace("os.listdir")
24	49	listdir_mock("/proc")
25	50	self.mocker.result(["12345"])
26	51		51
27	52	class FakeFile(object):	52	class FakeFile(object):
28	53		53
29	@@ -67,20 +67,21 @@
30	67	def close(self):	67	def close(self):
31	68	self.closed = True	68	self.closed = True
32	69		69
35	70	open_mock = self.mocker.replace("__builtin__.open")	70	list_dir_mock.return_value = ["12345"]
34	71	open_mock("/proc/12345/cmdline", "r")
36	72	fakefile1 = FakeFile("test-binary")	71	fakefile1 = FakeFile("test-binary")
37	73	self.mocker.result(fakefile1)
38	74
39	75	open_mock("/proc/12345/status", "r")
40	76	fakefile2 = FakeFile(None)	72	fakefile2 = FakeFile(None)
47	77	self.mocker.result(fakefile2)	73
48	78		74	with mock.patch("__builtin__.open", mock.mock_open()) as open_mock:
49	79	self.mocker.replay()	75	# This means "return fakefile1, then fakefile2"
50	80		76	open_mock.side_effect = [fakefile1, fakefile2]
51	81	process_info = ProcessInformation("/proc")	77	process_info = ProcessInformation("/proc")
52	82	processes = list(process_info.get_all_process_info())	78	processes = list(process_info.get_all_process_info())
53			79	calls = [
54			80	mock.call("/proc/12345/cmdline", "r"),
55			81	mock.call("/proc/12345/status", "r")]
56			82	open_mock.assert_has_calls(calls)
57	83	self.assertEqual(processes, [])	83	self.assertEqual(processes, [])
58			84	list_dir_mock.assert_called_with("/proc")
59	84	self.assertTrue(fakefile1.closed)	85	self.assertTrue(fakefile1.closed)
60	85	self.assertTrue(fakefile2.closed)	86	self.assertTrue(fakefile2.closed)
61	86		87