Merge lp:~gocept/landscape-client/py3-fd into lp:~landscape/landscape-client/trunk

[Steffen Allner]

Support both Python2/3 in landscape.lib.fd module tests: range() returns a generator in python 3 where we want to compare whole lists.

We are on the journey to Python 2/3 compatibility.

This MP considers fixes a test for landscape.lib.fd module, as in python 3 `range()` returns a generator, but we want to compare the whole list.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 959
Branch: lp:~gocept/landscape-client/py3-fd
Jenkins: https://ci.lscape.net/job/latch-test-precise/897/

review: Approve (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: TRIAL_ARGS=-j4 make check
Result: Success
Revno: 959
Branch: lp:~gocept/landscape-client/py3-fd
Jenkins: https://ci.lscape.net/job/latch-test-xenial/1461/

review: Approve (test results)

[Alberto Donato (ack)]

+1

review: Approve

[Geoff Teale (tealeg)]

+1

review: Approve

=== modified file 'landscape/lib/tests/test_fd.py'
--- landscape/lib/tests/test_fd.py	2016-06-15 20:14:49 +0000
+++ landscape/lib/tests/test_fd.py	2017-03-09 10:11:32 +0000
@@ -40,7 +40,7 @@
 
         getrlimit_mock.assert_called_once_with(resource.RLIMIT_NOFILE)
 
-        expected_fds = range(3, 4096)
+        expected_fds = list(range(3, 4096))
         calls = [call(i) for i in expected_fds]
         close_mock.assert_has_calls(calls, any_order=True)
 
@@ -62,7 +62,7 @@
                 clean_fds()
 
         getrlimit_mock.assert_called_once_with(resource.RLIMIT_NOFILE)
-        expected_fds = range(3, 10)
+        expected_fds = list(range(3, 10))
         calls = [call(i) for i in expected_fds]
         close_mock.assert_has_calls(calls, any_order=True)
         self.assertEqual(closed_fds, expected_fds)