#185 config.ini is now generated and used in the root of the project …

…as default.
kozaka-tv · Jun 2, 2024 · f71c846 · f71c846
1 parent 100c168
commit f71c846
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/run_configs/run DEV.run.xml b/run_configs/run DEV.run.xml
@@ -14,7 +14,7 @@
     <option name="ADD_SOURCE_ROOTS" value="true" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="$PROJECT_DIR$/run.py" />
-    <option name="PARAMETERS" value="-c config/config.dev.ini -db servant.dev.db" />
+    <option name="PARAMETERS" value="-c config.dev.ini -db servant.dev.db" />
     <option name="SHOW_COMMAND_LINE" value="false" />
     <option name="EMULATE_TERMINAL" value="false" />
     <option name="MODULE_MODE" value="false" />

diff --git a/tests/utils/test_cmd_line_parser.py b/tests/utils/test_cmd_line_parser.py
@@ -1,4 +1,3 @@
-import os
 from unittest.mock import patch
 
 import pytest
@@ -9,7 +8,7 @@
 @patch('sys.argv', ['run.py'])
 def test_defaults():
     config, database = parse_args()
-    assert config == 'config' + os.sep + 'config.ini'
+    assert config == 'config.ini'
     assert database == 'servant.db'
 
 
@@ -30,14 +29,14 @@ def test_custom_config_with_config():
 @patch('sys.argv', ['run.py', '-db', 'custom_servant.db'])
 def test_custom_database_with_db():
     config, database = parse_args()
-    assert config == 'config' + os.sep + 'config.ini'
+    assert config == 'config.ini'
     assert database == 'custom_servant.db'
 
 
 @patch('sys.argv', ['run.py', '--database', 'custom_servant.db'])
 def test_custom_database_with_database():
     config, database = parse_args()
-    assert config == 'config' + os.sep + 'config.ini'
+    assert config == 'config.ini'
     assert database == 'custom_servant.db'
 
 

diff --git a/utils/cmd_line_parser.py b/utils/cmd_line_parser.py
@@ -1,11 +1,10 @@
 import argparse
-import os
 
 
 def parse_args():
     parser = argparse.ArgumentParser(description='Servant script for managing Rocksmith sessions.')
-    parser.add_argument('-c', '--config', default='config' + os.sep + 'config.ini',
-                        help='Path of the configuration file like: config' + os.sep + 'my_config.ini')
+    parser.add_argument('-c', '--config', default='config.ini',
+                        help='Path of the configuration file like: my_config.ini')
     parser.add_argument('-db', '--database', default='servant.db',
                         help='Path of the database file like: my_database.db')