[oe-commits] [openembedded-core] 11/18: oeqa/runtime/df: don't fail on long device names

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 9122f9a68c827952fd66c765e5949120b6f5fc69
Author: André Draszik <git at andred.net>
AuthorDate: Wed Oct 16 10:18:22 2019 +0100

    oeqa/runtime/df: don't fail on long device names
    
    When device names are long (more than 20 characters), the
    df test will fail with an exception:
        self.assertTrue(int(output)>5120, msg=msg)
        ValueError: invalid literal for int() with base 10: ''
    at least when busybox is in use.
    
    The reason is that busybox breaks the line in that case:
        Filesystem           1K-blocks      Used Available Use% Mounted on
        /dev/disk/by-partuuid/8e991e5a-cebd-4f88-9494-c9db4f30cb02
                               1998672     87024   1790408   5% /
    and the code tries to extract the fourth field from the
    second line, which is empty of course.
    
    df can be told not to break lines, though, using the -P
    flag, which turns on the POSIX output format, and is
    supported by busybox df and coreutils df:
        Filesystem           1024-blocks    Used Available Capacity Mounted on
        /dev/disk/by-partuuid/8e991e5a-cebd-4f88-9494-c9db4f30cb02   1998672     87024   1790408   5% /
    
    Signed-off-by: André Draszik <git at andred.net>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/runtime/cases/df.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oeqa/runtime/cases/df.py b/meta/lib/oeqa/runtime/cases/df.py
index d8d79f3..89fd0fb 100644
--- a/meta/lib/oeqa/runtime/cases/df.py
+++ b/meta/lib/oeqa/runtime/cases/df.py
@@ -11,7 +11,7 @@ class DfTest(OERuntimeTestCase):
     @OETestDepends(['ssh.SSHTest.test_ssh'])
     @OEHasPackage(['coreutils', 'busybox'])
     def test_df(self):
-        cmd = "df / | sed -n '2p' | awk '{print $4}'"
+        cmd = "df -P / | sed -n '2p' | awk '{print $4}'"
         (status,output) = self.target.run(cmd)
         msg = 'Not enough space on image. Current size is %s' % output
         self.assertTrue(int(output)>5120, msg=msg)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.