Merge pull request #24 from rarylson/develop

Fix error message when config file not found

CHANGELOG.md

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+1.0.3
+-----
+
+- **Fix:** Error message when config file not found 
+
 1.0.2
 -----
 

tests/test_parse_all.py

@@ -116,7 +116,7 @@ def test_nonexistent_config_parse(self):
             with self.assertRaises(SystemExit):
                 main._parse_all()
             output = sys.stderr.getvalue()
-            self.assertTrue("config" in output and "not found" in output)
+            self.assertTrue("config file '/non-existent' not found" in output)
         finally:
             sys.stderr = stderr_old
 
@@ -129,7 +129,7 @@ def test_wrong_config_parse(self):
             with self.assertRaises(SystemExit):
                 main._parse_all()
             output = sys.stderr.getvalue()
-            self.assertTrue("section" in output and "not found" in output)
+            self.assertTrue("section name 'non_existent' not found" in output)
         finally:
             sys.stderr = stderr_old
 

tests/test_script.py

@@ -66,7 +66,10 @@ def test_script_error(self):
         args = [utils.APP]
         args += ["-f", file_path, "-d", dir_path]
         with self.assertRaises(subprocess.CalledProcessError):
-            subprocess.check_call(args, stderr=subprocess.STDOUT)
+            subprocess.check_call(
+                args,
+                stderr=subprocess.DEVNULL
+            )
 
     def test_script_verbose(self):
         """Script must print verbose messages when verbose is set

update_conf_py/main.py

@@ -20,7 +20,7 @@
 __author__ = "Rarylson Freitas"
 __email__ = "rarylson@gmail.com"
 __program__ = "update-conf.py"
-__version__ = "1.0.2.post1"
+__version__ = "1.0.3"
 __license__ = "Revised BSD"
 
 # Consts
@@ -110,9 +110,9 @@ def _parse_all():
         config_parser = ConfigParser()
         # Specific config file
         if args.config:
-            try:
+            if os.path.isfile(args.config):
                 config_parser.read(args.config)
-            except IOError:
+            else:
                 parser.error("config file '{0}' not found".format(args.config))
         # Default config file
         # Options from USER_CONFIG take precedence over SYSTEM_CONFIG