Merge lp:~allenap/maas/restore-content-from-file into lp:~maas-committers/maas/trunk

[Gavin Panella]

Restore content_from_file; test.parallel uses it.

[Gavin Panella (allenap)]

Selfie: undoing part of a branch I landed earlier.

review: Approve

=== added file 'src/maastesting/tests/test_parallel.py'
--- src/maastesting/tests/test_parallel.py	1970-01-01 00:00:00 +0000
+++ src/maastesting/tests/test_parallel.py	2017-01-23 16:40:51 +0000
@@ -0,0 +1,19 @@
+# Copyright 2017 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Tests for `maastesting.parallel`."""
+
+__all__ = []
+
+import types
+
+from maastesting.testcase import MAASTestCase
+from testtools.matchers import IsInstance
+
+
+class TestSmoke(MAASTestCase):
+    """Trivial smoke test."""
+
+    def test_imports_cleanly(self):
+        from maastesting import parallel
+        self.assertThat(parallel, IsInstance(types.ModuleType))

=== modified file 'src/maastesting/utils.py'
--- src/maastesting/utils.py	2017-01-06 09:50:17 +0000
+++ src/maastesting/utils.py	2017-01-23 16:40:51 +0000
@@ -5,6 +5,7 @@
 
 __all__ = [
     "age_file",
+    "content_from_file",
     "extract_word_list",
     "sample_binary_data",
 ]
@@ -13,6 +14,9 @@
 import os
 import re
 
+from testtools.content import Content
+from testtools.content_type import UTF8_TEXT
+
 
 def age_file(path, seconds):
     """Backdate a file's modification time so that it looks older."""
@@ -22,6 +26,21 @@
     os.utime(path, (atime, mtime - seconds))
 
 
+def content_from_file(path):
+    """Alternative to testtools' version.
+
+    This keeps an open file-handle, so it can obtain the log even when the
+    file has been unlinked.
+    """
+    fd = open(path, "rb")
+
+    def iterate():
+        fd.seek(0)
+        return iter(fd)
+
+    return Content(UTF8_TEXT, iterate)
+
+
 def extract_word_list(string):
     """Return a list of words from a string.