Merge pull request #26 from kbase/sdkdev

Move test.cfg into the root directory

.github/workflows/test.yml

@@ -60,10 +60,9 @@ jobs:
         
         # set up test config
         cd $HOMEDIR
-        # TODO TEST move to root dir
-        cp test_scripts/test.cfg.example test_scripts/test.cfg
-        sed -i "s#^test.token=.*#test.token=$KBASE_CI_TOKEN#" test_scripts/test.cfg
-        sed -i "s#^test.token2=.*#test.token2=$KBASE_CI_TOKEN2#" test_scripts/test.cfg
+        cp test.cfg.example test.cfg
+        sed -i "s#^test.token=.*#test.token=$KBASE_CI_TOKEN#" test.cfg
+        sed -i "s#^test.token2=.*#test.token2=$KBASE_CI_TOKEN2#" test.cfg
 
     - name: Run tests
       shell: bash

.gitignore

@@ -32,6 +32,8 @@ src/java/us/kbase/mobu/git.properties
 /temp_test_files
 /test_scripts/ee_mock_service
 /lib/kbase_module_builder2.jar
+/test.cfg
+# old location of test.cfg
 /test_scripts/test.cfg
 /.coverage
 /coverage.xml

README.md

@@ -8,14 +8,10 @@ Documentation in this readme is for developing the SDK codebase itself. If you w
 
 ## Running the tests
 
-#### Python tests
-
-Copy `test_scripts/test.cfg.example` to `test.cfg` and fill it in appropriately, then
-
-```
-pipenv sync  --dev  # only needed on the first run or when the Pipfile.lock changes
-pipenv run make test-python
-```
+* Copy `test.cfg.example` to `test.cfg` and fill it in appropriately.
+* `pipenv sync  --dev`
+    * This only needs to be run prior to the first test run or when the Pipfile contents change.
+* `pipenv run make test`
 
 ## Notes and references
 

src/java/us/kbase/scripts/test/TestConfigHelper.java

@@ -17,7 +17,7 @@ public class TestConfigHelper {
     private static AuthToken token2 = null;
 
     public static void init() throws Exception {
-        final Ini testini = new Ini(new File("test_scripts/test.cfg"));
+        final Ini testini = new Ini(new File("test.cfg"));
         for (Object key: testini.get(TEST_CFG).keySet()) {
             String prop = key.toString();
             String value = testini.get(TEST_CFG, key);

test_scripts/py_module_tests/test_auth_client.py

@@ -29,7 +29,7 @@ class TestAuth(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         configfile = os.path.abspath(os.path.dirname(
-            os.path.abspath(__file__)) + '/../test.cfg')
+            os.path.abspath(__file__)) + '/../../test.cfg')
         print('Loading test config from ' + configfile)
         cfg = _ConfigParser()
         cfg.read(configfile)