improve test coverage over invalid arguments

tests/samples/configs/invalid_hide_file_names.cfg

@@ -0,0 +1,4 @@
+[settings]
+debug = false
+api_key = 033c47c9-0441-4eb5-8b3f-b51f27b31049
+hidefilenames = invalid(regex

tests/test_main.py

@@ -469,6 +469,59 @@ class MainTestCase(utils.TestCase):
             self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
             self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
 
+    @log_capture()
+    def test_does_not_hide_filenames_from_invalid_regex(self, logs):
+        logging.disable(logging.NOTSET)
+
+        response = Response()
+        response.status_code = 0
+        self.patched['wakatime.packages.requests.adapters.HTTPAdapter.send'].return_value = response
+
+        with utils.TemporaryDirectory() as tempdir:
+            entity = 'tests/samples/codefiles/emptyfile.txt'
+            shutil.copy(entity, os.path.join(tempdir, 'emptyfile.txt'))
+            entity = os.path.realpath(os.path.join(tempdir, 'emptyfile.txt'))
+            now = u(int(time.time()))
+            config = 'tests/samples/configs/invalid_hide_file_names.cfg'
+            key = str(uuid.uuid4())
+
+            args = ['--file', entity, '--key', key, '--config', config, '--time', now]
+
+            retval = execute(args)
+            self.assertEquals(retval, API_ERROR)
+            self.assertEquals(sys.stdout.getvalue(), '')
+            self.assertEquals(sys.stderr.getvalue(), '')
+
+            log_output = u("\n").join([u(' ').join(x) for x in logs.actual()])
+            expected = 'WakaTime WARNING Regex error'
+            self.assertIn(expected, log_output)
+
+            self.patched['wakatime.session_cache.SessionCache.get'].assert_called_once_with()
+            self.patched['wakatime.session_cache.SessionCache.delete'].assert_called_once_with()
+            self.patched['wakatime.session_cache.SessionCache.save'].assert_not_called()
+
+            heartbeat = {
+                'language': 'Text only',
+                'lines': 0,
+                'entity': entity,
+                'project': os.path.basename(os.path.abspath('.')),
+                'time': float(now),
+                'type': 'file',
+            }
+            stats = {
+                u('cursorpos'): None,
+                u('dependencies'): [],
+                u('language'): u('Text only'),
+                u('lineno'): None,
+                u('lines'): 0,
+            }
+
+            self.patched['wakatime.offlinequeue.Queue.push'].assert_called_once_with(ANY, ANY, None)
+            for key, val in self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][0].items():
+                self.assertEquals(heartbeat[key], val)
+            self.assertEquals(stats, json.loads(self.patched['wakatime.offlinequeue.Queue.push'].call_args[0][1]))
+            self.patched['wakatime.offlinequeue.Queue.pop'].assert_not_called()
+
     def test_invalid_timeout_passed_via_command_line(self):
         response = Response()
         response.status_code = 201

wakatime/main.py

@@ -210,11 +210,7 @@ def parseArguments():
             except SystemExit:
                 raise SystemExit(AUTH_ERROR)
 
-    is_valid = False
-    try:
-        is_valid = not not re.match(r'^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$', args.key, re.I)
-    except:
-        pass
+    is_valid = not not re.match(r'^[a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$', args.key, re.I)
     if not is_valid:
         try:
             parser.error('Invalid api key. Find your api key from wakatime.com/settings.')
@@ -260,25 +256,18 @@ def parseArguments():
             if option.strip().lower() == 'true':
                 args.hidefilenames = ['.*']
             elif option.strip().lower() != 'false':
-                try:
-                    for pattern in option.split("\n"):
-                        if pattern.strip() != '':
-                            args.hidefilenames.append(pattern)
-                except TypeError:
-                    pass
+                for pattern in option.split("\n"):
+                    if pattern.strip() != '':
+                        args.hidefilenames.append(pattern)
     if args.offline and configs.has_option('settings', 'offline'):
         args.offline = configs.getboolean('settings', 'offline')
     if not args.proxy and configs.has_option('settings', 'proxy'):
         args.proxy = configs.get('settings', 'proxy')
     if args.proxy:
-        is_valid = False
-        try:
-            pattern = r'^((https?|socks5)://)?([^:@]+(:([^:@])+)?@)?[^:]+(:\d+)?$'
-            if '\\' in args.proxy:
-                pattern = r'^.*\\.+$'
-            is_valid = not not re.match(pattern, args.proxy, re.I)
-        except:
-            pass
+        pattern = r'^((https?|socks5)://)?([^:@]+(:([^:@])+)?@)?[^:]+(:\d+)?$'
+        if '\\' in args.proxy:
+            pattern = r'^.*\\.+$'
+        is_valid = not not re.match(pattern, args.proxy, re.I)
         if not is_valid:
             parser.error('Invalid proxy. Must be in format ' +
                             'https://user:pass@host:port or ' +