Fix broken tests because of refactoring

pwman/__init__.py

@@ -75,7 +75,9 @@ def parser_options(formatter_class=argparse.HelpFormatter):  # pragma: no cover
                                      description=description,
                                      formatter_class=formatter_class)
     parser.add_argument('-c', '--config', dest='cfile',
-                        default=os.path.expanduser("~/.pwman/config"),
+                        default=os.path.join(
+                                             config.find_config_dir('pwman'),
+                                             'config'),
                         help='cofiguration file to read')
     parser.add_argument('-d', '--database', dest='dbase')
     parser.add_argument('-i', '--import', nargs=2, dest='file_delim',
@@ -94,7 +96,7 @@ def get_conf(args):
     config_dir = config.find_config_dir('pwman')
 
     if not os.path.isdir(config_dir):  # pragma: no cover
-        os.mkdir(config_dir)
+        os.makedirs(config_dir, exist_ok=True)
 
     configp = config.Config(args.cfile, config.default_config)
     return configp

tests/test_config.py

@@ -22,6 +22,7 @@ import sys
 import unittest
 import unittest.mock
 from pwman.util import config
+from pwman.util.config import find_config_dir
 
 
 if sys.version_info.major > 2:
@@ -105,12 +106,13 @@ class TestConfig(unittest.TestCase):
         self.assertTrue(self.conf.parser.has_section('Readline'))
 
     def test_has_user_history(self):
-        path = os.path.expanduser(os.path.join("~/.pwman", "history"))
+        cdir = find_config_dir('pwman')
+        path = os.path.join(cdir, "history")
         config = self.conf.get_value('Readline', 'history')
         self.assertEqual(path, config)
 
     def test_has_user_db(self):
-        self.assertNotEqual(os.path.expanduser('~/.pwman/pwman.db'),
+        self.assertNotEqual(os.path.join(config.find_config_dir("pwman"),'pwman.db'),
                             self.conf.get_value('Database', 'filename'))
 
     def test_wrong_config(self):