Re: [PATCH v5 11/11] test: Add a test for the PCP ManagedDTraceScript interface

[Alan Maguire <almagui@kernel.org>]

[-- Attachment #1: Type: text/plain, Size: 687 bytes --]

> 
> This should either add a dependency on python and pcp for the testsuite,
> or there should be a .x file to exclude this test when python and pcp
> are not available.  As it is now, not having PCP on the system will
> cause the test to fail.

The earlier python tests introduce a test.x for python availability, so
that should cover this test too. There is a test for pcp availability
below, see:

> +if ! "$DTRACE_PYTHON" -c 'import dtrace, cpmapi, cpmda, pcp.pmapi, pcp.pmda' \
> +    >/dev/null 2>&1; then
> +    echo "DTrace or PCP Python bindings are unavailable"
> +    exit 2
> +fi
> +

...but the exit 2 triggers a fail IIRC; something like the attached should
work I think..

[-- Attachment #2: 0001-test-Add-a-test-for-the-PCP-ManagedDTraceScript-inte.patch --]
[-- Type: text/x-patch, Size: 3600 bytes --]

From 37b5be874e207f244e92c64720ffbce0febaa2a1 Mon Sep 17 00:00:00 2001
From: Alan Maguire <alan.maguire@oracle.com>
Date: Tue, 18 Aug 2026 11:28:51 +0100
Subject: [PATCH 1/2] test: Add a test for the PCP ManagedDTraceScript
 interface

Since tests cannot rely on a full PCP configuration, do
limited testing of a ManagedDTraceScript, ensuring that
we can create it, start it and that it collects data.

Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
 test/unittest/python/tst.pcp.sh | 63 +++++++++++++++++++++++++++++++++
 test/unittest/python/tst.pcp.x  | 16 +++++++++
 2 files changed, 79 insertions(+)
 create mode 100755 test/unittest/python/tst.pcp.sh
 create mode 100755 test/unittest/python/tst.pcp.x

diff --git a/test/unittest/python/tst.pcp.sh b/test/unittest/python/tst.pcp.sh
new file mode 100755
index 00000000..cd8c03b4
--- /dev/null
+++ b/test/unittest/python/tst.pcp.sh
@@ -0,0 +1,63 @@
+#!/bin/bash
+#
+# Oracle Linux DTrace.
+# Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
+#
+# Test the PCP ManagedDTraceScript with a real DTrace session.
+# @@timeout: 60
+
+if [ $# -ne 1 ]; then
+    echo "usage: $0 <dtrace>" >&2
+    exit 2
+fi
+
+tmpdir=$(mktemp -d)
+cleanup() { rm -rf "$tmpdir"; }
+trap cleanup EXIT
+
+cat >"$tmpdir/test.py" <<'EOF'
+#!/usr/bin/env python3
+import importlib.machinery
+import importlib.util
+import time
+
+loader = importlib.machinery.SourceFileLoader("pmdadtrace", "pcp/pmdadtrace.python")
+spec = importlib.util.spec_from_loader("pmdadtrace", loader)
+pmdadtrace = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(pmdadtrace)
+
+created = []
+script = pmdadtrace.ManagedDTraceScript(
+    "tick_test", "profile:::tick-1s /$1 == 1/ { @ticks = count(); }", False,
+    {"quiet": True}, ".", None, None, [], ["1"], 0,
+    print,
+)
+script._data_callbacks = {
+    "create_metric": lambda entry: created.append(("metric", entry.metric)),
+    "create_instance": lambda entry: created.append(
+        ("instance", entry.metric, entry.instance)
+    ),
+    "update_instance": lambda entry: None,
+    "remove_instance": lambda entry: None,
+    "refresh_metrics": lambda: None,
+}
+
+ok, error = script.start()
+if not ok:
+    raise SystemExit(f"unable to start ManagedDTraceScript: {error}")
+time.sleep(15)
+script.stop()
+
+entries = script.latest_aggregations()
+if script.state() == "error":
+    raise SystemExit(f"ManagedDTraceScript failed: {script.last_error()}")
+if not any(entry.metric.endswith(".ticks") for entry in entries.values()):
+    raise SystemExit(f"tick aggregation was not published: {entries}")
+if not any(item[0] == "instance" for item in created):
+    raise SystemExit(f"tick metric instance was not created: {created}")
+EOF
+
+chmod +x "$tmpdir/test.py"
+timeout 60 "$DTRACE_PYTHON" "$tmpdir/test.py"
diff --git a/test/unittest/python/tst.pcp.x b/test/unittest/python/tst.pcp.x
new file mode 100755
index 00000000..8a05441e
--- /dev/null
+++ b/test/unittest/python/tst.pcp.x
@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Oracle Linux DTrace.
+# Copyright (c) 2026, Oracle and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at
+# http://oss.oracle.com/licenses/upl.
+#
+# Skip the PCP test when the PCP Python bindings are not installed.
+#
+
+if ! "$DTRACE_PYTHON" -c 'import cpmapi, cpmda, pcp.pmapi, pcp.pmda' >/dev/null 2>&1; then
+	echo "PCP Python bindings are unavailable"
+	exit 2
+fi
+
+exit 0
-- 
2.55.0