[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4358/8267] selftest: wic: split test_debug test case

[Emmanuele Bassi <ebassi src gnome org>]

commit e330cf4a3842272d2ee238312aaf1fbd34b94f41
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Jan 26 13:28:17 2017 +0200

    selftest: wic: split test_debug test case
    
    Splitted to test_debug_short and test_debug_long to make each
    of the test cases to run wic once. This is consistent with the
    rest of the test cases and ensures that test cases are set up
    properly.
    
    This also fixes the following test failure caused by the image
    left from the first wic run:
    
    FAIL: test_debug (oeqa.selftest.wic.Wic)
    Test debug
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "meta/lib/oeqa/utils/decorators.py", line 109, in wrapped_f
        return func(*args, **kwargs)
      File "meta/lib/oeqa/selftest/wic.py", line 270, in test_debug
        self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
    AssertionError: 1 != 2
    
    (From OE-Core rev: a453009821d7d7cb1dd8a7ae05c0d32227b4753b)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oeqa/selftest/wic.py |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/selftest/wic.py b/meta/lib/oeqa/selftest/wic.py
index 11dc744..b279b8c 100644
--- a/meta/lib/oeqa/selftest/wic.py
+++ b/meta/lib/oeqa/selftest/wic.py
@@ -259,12 +259,15 @@ class Wic(oeSelfTest):
                                    "-c wrong", ignore_status=True).status)
 
     @testcase(1558)
-    def test_debug(self):
-        """Test debug"""
+    def test_debug_short(self):
+        """Test -D option"""
         self.assertEqual(0, runCmd("wic create directdisk "
                                    "--image-name=core-image-minimal "
                                    "-D").status)
         self.assertEqual(1, len(glob(self.resultdir + "directdisk-*.direct")))
+
+    def test_debug_long(self):
+        """Test --debug option"""
         self.assertEqual(0, runCmd("wic create directdisk "
                                    "--image-name=core-image-minimal "
                                    "--debug").status)