[lldb][NFC] Merge multiple TestApropos.py

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

llvm-svn: 369530

diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py b/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py
index f844771..c4337c7 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/apropos/TestApropos.py
@@ -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'])

diff --git a/lldb/packages/Python/lldbsuite/test/help/TestApropos.py b/lldb/packages/Python/lldbsuite/test/help/TestApropos.py
deleted file mode 100644 (file)
index f48d512..0000000
--- a/lldb/packages/Python/lldbsuite/test/help/TestApropos.py
+++ /dev/null
@@ -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'])