[Lldb-commits] [lldb] r369530 - [lldb][NFC] Merge multiple TestApropos.py

[Raphael Isemann via lldb-commits]

Author: teemperor
Date: Wed Aug 21 07:22:59 2019
New Revision: 369530

URL: http://llvm.org/viewvc/llvm-project?rev=369530&view=rev
Log:
[lldb][NFC] Merge multiple TestApropos.py

That's cleaner and makes lldb-dotest no longer fail due to conflicting names.

Removed:
    lldb/trunk/packages/Python/lldbsuite/test/help/TestApropos.py
Modified:
    lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py?rev=369530&r1=369529&r2=369530&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py Wed Aug 21 07:22:59 2019
@@ -17,3 +17,13 @@ class AproposTestCase(TestBase):
                     substrs=[' must be called with exactly one argument'])
         self.expect("apropos ''", error=True,
                     substrs=['\'\' is not a valid search word'])
+
+    @no_debug_info_test
+    def test_apropos_variable(self):
+        """Test that 'apropos variable' prints the fully qualified command name"""
+        self.expect(
+            'apropos variable',
+            substrs=[
+                'frame variable',
+                'target variable',
+                'watchpoint set variable'])

Removed: lldb/trunk/packages/Python/lldbsuite/test/help/TestApropos.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/help/TestApropos.py?rev=369529&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/help/TestApropos.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/help/TestApropos.py (removed)
@@ -1,26 +0,0 @@
-"""
-Test some lldb apropos commands.
-"""
-
-from __future__ import print_function
-
-
-import lldb
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class AproposCommandTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @no_debug_info_test
-    def test_apropos_variable(self):
-        """Test that 'apropos variable' prints the fully qualified command name"""
-        self.expect(
-            'apropos variable',
-            substrs=[
-                'frame variable',
-                'target variable',
-                'watchpoint set variable'])