Merge branch '1500_deprecated_warnings' of https://github.com/timjohncurtis/RIDE into timjohncurtis-1500_deprecated_warnings

Author: yanne

src/robotide/contrib/testrunner/testrunner.py

@@ -171,15 +171,15 @@ def run_command(self, command, cwd):
         self._process = Process(cwd)
         self._process.run_command(command)
 
-    def get_command(self, profile, pythonpath, monitor_width, names_to_run):
+    def get_command(self, profile, pythonpath, console_width, names_to_run):
         '''Return the command (as a list) used to run the test'''
         command = profile.get_command_prefix()[:]
         argfile = os.path.join(self._output_dir, "argfile.txt")
         command.extend(["--argumentfile", argfile])
         command.extend(["--listener", self._get_listener_to_cmd()])
         command.append(self._get_suite_source_for_command())
         self._write_argfile(argfile, self._create_standard_args(
-            command, profile, pythonpath, monitor_width, names_to_run))
+            command, profile, pythonpath, console_width, names_to_run))
         return command
 
     @staticmethod
@@ -211,16 +211,16 @@ def _get_suite_source_for_command(self):
         return os.path.abspath(self._project.suite.source)
 
     def _create_standard_args(
-            self, command, profile, pythonpath, monitor_width, names_to_run):
+            self, command, profile, pythonpath, console_width, names_to_run):
         standard_args = []
         standard_args.extend(profile.get_custom_args())
         self._add_tmp_outputdir_if_not_given_by_user(command, standard_args)
         self._add_pythonpath_if_in_settings_and_not_given_by_user(
             command, standard_args, pythonpath)
         # Have to use short options, because of long option was changed in
         # RF 2.8 -> 2.9, and we don't necessarily know the installed version.
-        standard_args.extend(["-C", "off"])
-        standard_args.extend(["-W", monitor_width])
+        standard_args.extend(["-C", "off"]) # --consolecolor
+        standard_args.extend(["-W", console_width]) # --consolewidth
         for suite, test in names_to_run:
             standard_args += ['--suite', suite, '--test', test]
         return standard_args

src/robotide/contrib/testrunner/testrunnerplugin.py

@@ -266,7 +266,7 @@ def _create_command(self):
         command_as_list = self._test_runner.get_command(
             self.get_current_profile(),
             self.global_settings.get('pythonpath', None),
-            self._get_monitor_width(),
+            self._get_console_width(),
             self._names_to_run)
         self._min_log_level_number = self._test_runner.get_message_log_level(command_as_list)
         command = self._format_command(command_as_list)
@@ -446,7 +446,7 @@ def _AppendText(self, textctrl, string, source="stdout"):
             linecount = textctrl.GetLineCount()
             textctrl.ScrollToLine(linecount)
 
-    def _get_monitor_width(self):
+    def _get_console_width(self):
         # robot wants to know a fixed size for output, so calculate the
         # width of the window based on average width of a character. A
         # little is subtracted just to make sure there's a little margin

src/robotide/contrib/testrunner/usages.py

@@ -231,16 +231,16 @@
     --runmode mode *      Deprecated in version 2.8. Use individual options
                           --dryrun, --exitonfailure, --skipteardownonexit, or
                           --randomize instead.
- -W --monitorwidth chars  Width of the monitor output. Default is 78.
- -C --monitorcolors auto|on|ansi|off  Use colors on console output or not.
+ -W --consolewidth chars  Width of the console output. Default is 78.
+ -C --consolecolors auto|on|ansi|off  Use colors on console output or not.
                           auto: use colors when output not redirected (default)
                           on:   always use colors
                           ansi: like `on` but use ANSI colors also on Windows
                           off:  disable colors altogether
                           Note that colors do not work with Jython on Windows.
- -K --monitormarkers auto|on|off  Show `.` (success) or `F` (failure) on
+ -K --consolemarkers auto|on|off  Show `.` (success) or `F` (failure) on
                           console when top level keywords in test cases end.
-                          Values have same semantics as with --monitorcolors.
+                          Values have same semantics as with --consolecolors.
  -P --pythonpath path *   Additional locations (directories, ZIPs, JARs) where
                           to search test libraries from when they are imported.
                           Multiple paths can be given by separating them with a
@@ -326,4 +326,4 @@
 # Setting syslog file before running tests.
 $ export ROBOT_SYSLOG_FILE=/tmp/syslog.txt
 $ pybot tests.tsv
-"""
+"""

utest/contrib/testrunner/test_command_creation.py

@@ -29,8 +29,8 @@ def test_command(self):
             ['custom', 'args',
              '--outputdir', 'temppi',
              '--pythonpath', 'PYTHON:PATH',
-             '-C', 'off',
-             '-W', 7,
+             '-C', 'off', # --consolecolors
+             '-W', 7, # --consolewidth
              '--suite', 'suite',
              '--test', 'suite.test'])