Merge remote-tracking branch 'origin/develop'

Author: awdeorio

agiocli/__main__.py

@@ -82,11 +82,12 @@ def courses(ctx, course_arg, show_list, web):  # noqa: D301
 @click.option("-l", "--list", "show_list", is_flag=True,
               help="List projects and exit.")
 @click.option("-w", "--web", is_flag=True, help="Open project in browser.")
+@click.option("--config", is_flag=True, help="Get test suite config.")
 @click.pass_context
 # The \b character in the docstring prevents Click from rewraping a paragraph.
 # We need to tell pycodestyle to ignore it.
 # https://click.palletsprojects.com/en/8.0.x/documentation/#preventing-rewrapping
-def projects(ctx, project_arg, course_arg, show_list, web):  # noqa: D301
+def projects(ctx, project_arg, course_arg, show_list, web, config):  # noqa: D301
     """Show project detail or list projects.
 
     PROJECT_ARG is a primary key, name, or shorthand.
@@ -99,8 +100,10 @@ def projects(ctx, project_arg, course_arg, show_list, web):  # noqa: D301
     agio projects --course 109 p1
     agio projects --course eecs485sp21 p1
     agio projects p1
+    agio projects --course eecs485sp21 p1 --config
 
     """
+    # pylint: disable=too-many-arguments
     try:
         client = APIClient.make_default(debug=ctx.obj["DEBUG"])
     except TokenFileNotFound as err:
@@ -114,11 +117,23 @@ def projects(ctx, project_arg, course_arg, show_list, web):  # noqa: D301
             print(utils.project_str(i))
         return
 
-    # Select a project and print or open it
+    # Select a project
     project = utils.get_project_smart(project_arg, course_arg, client)
+
+    # Print test suite config if --config flag
+    if config:
+        config_json = client.get(
+            f"/api/projects/{project['pk']}/ag_test_suites/"
+        )
+        print(utils.dict_str(config_json))
+        return
+
+    # Open project if --web flag
     if web:
         utils.open_web(f"https://autograder.io/web/project/{project['pk']}")
         return
+
+    # Otherwise print project info
     print(utils.dict_str(project))
 
 

setup.py

@@ -15,7 +15,7 @@
     description="A command line interface to autograder.io",
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",
-    version="0.3.0",
+    version="0.4.0",
     author="Andrew DeOrio",
     author_email="[email protected]",
     url="https://github.com/eecs485staff/agio-cli/",

tests/conftest.py

@@ -1,6 +1,7 @@
 """Shared test fixtures."""
 import json
 import pytest
+import utils
 
 
 @pytest.fixture(name="constants")
@@ -138,7 +139,7 @@ def constants_setup():
             "grading_start_time": "2021-06-09T12:49:21.340598Z",
             "non_deferred_grading_end_time": "2021-06-09T12:50:26.978440Z",
             "last_modified": "2021-06-09T12:50:25.899462Z"
-        }
+        },
     }
 
 
@@ -551,3 +552,12 @@ def api_requests_mock(requests_mock, mocker, constants):
         headers={"Content-Type": "application/json"},
         text=json.dumps(constants["SUBMISSION_1125717"]),
     )
+
+    # Project autograder configuration
+    config_path = utils.TESTDATA_DIR/"eecs485sp21_p1_config.json"
+    config_text = config_path.read_text()
+    requests_mock.get(
+        "https://autograder.io/api/projects/1005/ag_test_suites/",
+        headers={"Content-Type": "application/json"},
+        text=config_text,
+    )

tests/test_projects.py

@@ -5,8 +5,10 @@
 """
 import json
 import textwrap
+import shlex
 import click
 import click.testing
+import utils
 from agiocli.__main__ import main
 
 
@@ -150,3 +152,25 @@ def test_projects_empty(api_mock, mocker, constants):
     assert result.exit_code == 0, result.output
     output_obj = json.loads(result.output)
     assert output_obj["pk"] == 1005
+
+
+def test_projects_config(api_mock, mocker, constants):
+    """Verify projects subcommand with --config option.
+
+    $ agio projects -c eecs485sp21 p1 --config
+
+    api_mock is a shared test fixture that mocks responses to REST API
+    requests. It is implemented in conftest.py
+
+    """
+    runner = click.testing.CliRunner()
+    result = runner.invoke(
+        main, shlex.split("projects -c eecs485sp21 p1 --config"),
+        catch_exceptions=False,
+    )
+    assert result.exit_code == 0, result.output
+    output = json.loads(result.output)
+    expected_path = utils.TESTDATA_DIR/"eecs485sp21_p1_config.json"
+    with expected_path.open(encoding="utf-8") as infile:
+        expected = json.load(infile)
+    assert output == expected