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

[Steffen Allner]

This is the Py3 port of landscape.monitor.computeruptime.

It is strictly bytes/unicode fixes.

This MP ensures that the values gathered from wtmp/utmp are properly decoded and encoded in the test setup.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Alberto Donato (ack)]

+1

review: Approve

[lp:~gocept/landscape-client/py3-monitor-computeruptime]

990. By Steffen Allner on 2017-03-29

Make LoginInfo._strip_and_decode() a non-static method.

[Steffen Allner (sallner)]

I switched to a non static method.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

[Michael Howitz (mh-gocept)]

LGTM.

review: Approve

[Eric Snow (ericsnowcurrently)]

LGTM

review: Approve

=== modified file 'landscape/monitor/computeruptime.py'
--- landscape/monitor/computeruptime.py	2017-03-10 12:11:58 +0000
+++ landscape/monitor/computeruptime.py	2017-03-29 11:21:20 +0000
@@ -32,10 +32,10 @@
         info = struct.unpack(self.RAW_FORMAT, raw_data)
         self.login_type = info[0]
         self.pid = info[1]
-        self.tty_device = info[2].strip("\0")
-        self.id = info[3].strip("\0")
-        self.username = info[4].strip("\0")
-        self.hostname = info[5].strip("\0")
+        self.tty_device = self._strip_and_decode(info[2])
+        self.id = self._strip_and_decode(info[3])
+        self.username = self._strip_and_decode(info[4])
+        self.hostname = self._strip_and_decode(info[5])
         self.termination_status = info[6]
         self.exit_status = info[7]
         self.session_id = info[8]
@@ -43,6 +43,10 @@
         # FIXME Convert this to a dotted decimal string. -jk
         self.remote_ip_address = info[11]
 
+    def _strip_and_decode(self, bytestring):
+        """Helper method to strip b"\0" and return a utf-8 decoded string."""
+        return bytestring.strip(b"\0").decode("utf-8")
+
 
 class LoginInfoReader(object):
     """Reader parses C{/var/log/wtmp} and/or C{/var/run/utmp} files.
@@ -87,7 +91,7 @@
     def get_times(self):
         reboot_times = []
         shutdown_times = []
-        with open(self._filename) as login_info_file:
+        with open(self._filename, "rb") as login_info_file:
             reader = LoginInfoReader(login_info_file)
             self._last_boot = self._boots_newer_than
             self._last_shutdown = self._shutdowns_newer_than

=== modified file 'landscape/monitor/tests/test_computeruptime.py'
--- landscape/monitor/tests/test_computeruptime.py	2016-06-15 16:45:39 +0000
+++ landscape/monitor/tests/test_computeruptime.py	2017-03-29 11:21:20 +0000
@@ -17,11 +17,14 @@
     file = open(filename, "ab")
     try:
         file.write(struct.pack(LoginInfo.RAW_FORMAT, login_type, pid,
-                               tty_device, id, username, hostname,
+                               tty_device.encode("utf-8"), id.encode("utf-8"),
+                               username.encode("utf-8"),
+                               hostname.encode("utf-8"),
                                termination_status, exit_status, session_id,
                                entry_time_seconds, entry_time_milliseconds,
                                remote_ip_address[0], remote_ip_address[1],
-                               remote_ip_address[2], remote_ip_address[3], ""))
+                               remote_ip_address[2], remote_ip_address[3],
+                               b""))
     finally:
         file.close()
 

=== modified file 'py3_ready_tests'
--- py3_ready_tests	2017-03-29 11:21:20 +0000
+++ py3_ready_tests	2017-03-29 11:21:20 +0000
@@ -8,7 +8,7 @@
 
 
 landscape.monitor.tests.test_activeprocessinfo
-
+landscape.monitor.tests.test_computeruptime