Have lsbrelease_utils function respect argument default.
The API of the lsbrelease_utils functions says that when the
lsb_release_content is None, we try to infer it ourselves. But the
implementation tries to infer the content even when the argument is
passed in and is ''. This is not ideal because a call from drone may
result in an empty lsb_release_content being returned from a DUT. A
subsequent call to lsbrelease_utils functions will incorrectly check the
/etc/lsb-release on the drone (if present).
BUG=b:28453441
TEST=None.
- Spot checked manually that none of the callers would be impacted
by this change. This is especially difficult because all these
functions are imported by another utils module and used from
there.
Change-Id: I2d6ded6016fb6e373de3969632f02ad9bc027cd5
Reviewed-on: https://chromium-review.googlesource.com/536414
Commit-Ready: Prathmesh Prabhu <pprabhu@chromium.org>
Tested-by: Prathmesh Prabhu <pprabhu@chromium.org>
Reviewed-by: Allen Li <ayatane@chromium.org>
diff --git a/client/common_lib/lsbrelease_utils.py b/client/common_lib/lsbrelease_utils.py
index 5ec9883..4fdccf4 100644
--- a/client/common_lib/lsbrelease_utils.py
+++ b/client/common_lib/lsbrelease_utils.py
@@ -30,7 +30,7 @@
@raises IOError if /etc/lsb-release can not be accessed.
"""
- if not lsb_release_content:
+ if lsb_release_content is None:
with open(constants.LSB_RELEASE) as lsb_release_file:
lsb_release_content = lsb_release_file.read()
for line in lsb_release_content.split('\n'):
diff --git a/client/common_lib/lsbrelease_utils_unittest.py b/client/common_lib/lsbrelease_utils_unittest.py
index 2d0422e..2280b50 100755
--- a/client/common_lib/lsbrelease_utils_unittest.py
+++ b/client/common_lib/lsbrelease_utils_unittest.py
@@ -107,13 +107,8 @@
self.assertTrue(lsbrelease_utils.is_jetstream(
_WHIRLWIND_LSB_RELEASE_REDACTED))
- @unittest.expectedFailure
def test_is_moblab_with_empty_lsbrelease(self):
- """is_moblab correctly validates trivial lsb-release information.
-
- TODO(pprabhu) This test currently fails because _lsbrelease_search does
- not respect its arguments. Fix it in a separate CL.
- """
+ """is_moblab correctly validates trivial lsb-release information."""
self.assertFalse(lsbrelease_utils.is_moblab(''))
def test_is_moblab_with_link_lsbrelease(self):
