Split out console and file writing cases in TestCommandScriptImmediateOutput

[fjricci]

Summary

As these are really testing separate issues, they should be run as separate
tests.

[granata.enrico]

packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py

29 ↗

(On Diff #55490)

Can we raise this a little bit? I worry that going all the way from 60 down to 5 might cause this test to start failing more in load scenarios. Maybe 10 would be a better value?

43 ↗

(On Diff #55490)

Feel free to make the file version non pexpect-based if you want

[fjricci]

packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py

29 ↗

(On Diff #55490)

I chose 5 because your original console unit test used 5. I changed it to 60 when I added the file aspects. I don't have a problem changing it to 10 though

43 ↗

(On Diff #55490)

I ended up finding clayborg's sendline bug-fix, so pexpect should be fine (actually probably preferred)

[granata.enrico]

packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py

29 ↗

(On Diff #55490)

10 is probably fine - the file version also seems to use 10, so I'd just make them consistent. Other than that LGTM.

[fjricci]

Update timeout to 10 seconds for console case

[granata.enrico]

LGTM

lldb/trunk/packages/Python/lldbsuite/test/functionalities/command_script_immediate_output/TestCommandScriptImmediateOutput.py

class CommandScriptImmediateOutputTestCase (PExpectTest):
 
     def setUp(self):
         # Call super's setUp().
         PExpectTest.setUp(self)
 
     @skipIfRemote # test not remote-ready llvm.org/pr24813
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
     @expectedFailureAll(oslist=["freebsd","linux"], bugnumber="llvm.org/pr26139")
-    def test_command_script_immediate_output (self):
-        """Test that LLDB correctly allows scripted commands to set an immediate output file."""
-        self.launch(timeout=60)
+    def test_command_script_immediate_output_console (self):
+        """Test that LLDB correctly allows scripted commands to set immediate output to the console."""
+        self.launch(timeout=10)
 
         script = os.path.join(os.getcwd(), 'custom_command.py')
         prompt = "\(lldb\) "
-                                                                      
         self.sendline('command script import %s' % script, patterns=[prompt])
         self.sendline('command script add -f custom_command.command_function mycommand', patterns=[prompt])
         self.sendline('mycommand', patterns='this is a test string, just a test string')
         self.sendline('command script delete mycommand', patterns=[prompt])
+        self.quit(gracefully=False)
+
+    @skipIfRemote # test not remote-ready llvm.org/pr24813
+    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr22274: need a pexpect replacement for windows")
+    @expectedFailureAll(oslist=["freebsd","linux"], bugnumber="llvm.org/pr26139")
+    def test_command_script_immediate_output_file (self):
+        """Test that LLDB correctly allows scripted commands to set immediate output to a file."""
+        self.launch(timeout=10)
 
         test_files = {os.path.join(os.getcwd(), 'read.txt')        :'r',
                       os.path.join(os.getcwd(), 'write.txt')       :'w',
                       os.path.join(os.getcwd(), 'append.txt')      :'a',
                       os.path.join(os.getcwd(), 'write_plus.txt')  :'w+',
                       os.path.join(os.getcwd(), 'read_plus.txt')   :'r+',
                       os.path.join(os.getcwd(), 'append_plus.txt') :'a+'}
 
         starter_string = 'Starter Garbage\n'
         write_string   = 'writing to file with mode: '
 
         for path, mode in test_files.iteritems():
             with open(path, 'w+') as init:
                 init.write(starter_string)
 
+        script = os.path.join(os.getcwd(), 'custom_command.py')
+        prompt = "\(lldb\) "
+
+        self.sendline('command script import %s' % script, patterns=[prompt])
+
         self.sendline('command script add -f custom_command.write_file mywrite', patterns=[prompt])
         for path, mode in test_files.iteritems():
             command = 'mywrite "' + path + '" ' + mode
 
             self.sendline(command, patterns=[prompt])
 
         self.sendline('command script delete mywrite', patterns=[prompt])