Merge branch 'main' into update-contrib

agent/Makefile

@@ -51,7 +51,6 @@ util-scripts = \
 # Scripts based on the Python Click package, which are generated during
 # installation.
 click-scripts = \
-	pbench-generate-token \
 	pbench-cleanup \
 	pbench-clear-results \
 	pbench-clear-tools \

contrib/containerized-pbench/pbench_demo

@@ -23,6 +23,14 @@ export PB_AGENT_IMAGE_NAME=quay.io/pbench/pbench-agent-all-fedora-36:main
 
 mkdir -p "${FIOTEST}"
 
+# Before we run the demo, we need a Pbench API key. The key can be an
+# environment variable of PBENCH_API_KEY or need to be supplied to this
+# script as an argument.
+api_key=${1:-${PBENCH_API_KEY}}
+if [[ -z "${api_key}" ]]; then
+  echo "Pbench API key must be provided, either on the command line or via the PBENCH_API_KEY environment variable"
+  exit 2
+fi
 #+
 # Run the demo!
 #-

lib/pbench/test/unit/agent/task/test_results_push.py

@@ -147,6 +147,30 @@ def test_multiple_meta_args_single_option():
         assert result.exit_code == 0, result.stderr
         assert result.stdout == ""
 
+    @staticmethod
+    @responses.activate
+    def test_multiple_meta_args():
+        """Test normal operation when all arguments and options are specified"""
+
+        TestResultsPush.add_http_mock_response()
+        runner = CliRunner(mix_stderr=False)
+        result = runner.invoke(
+            main,
+            args=[
+                TestResultsPush.TOKN_SWITCH,
+                TestResultsPush.TOKN_TEXT,
+                TestResultsPush.ACCESS_SWITCH,
+                TestResultsPush.ACCESS_TEXT,
+                TestResultsPush.META_SWITCH,
+                TestResultsPush.META_TEXT_TEST,
+                TestResultsPush.META_SWITCH,
+                TestResultsPush.META_TEXT_FOO,
+                tarball,
+            ],
+        )
+        assert result.exit_code == 0, result.stderr
+        assert result.stderr == ""
+
     @staticmethod
     @responses.activate
     def test_token_omitted():