From 87364abd0e642a12e0823c3f8f82b7564bdd3170 Mon Sep 17 00:00:00 2001 From: Guillaume Boutry Date: Fri, 18 Oct 2024 11:47:59 +0200 Subject: [PATCH] [ops-sunbeam] Update harness private paths ops 2.17 officially deprecated harness and moved some of the internal paths (that we're not supposed to use, but we do). Update these paths, but we need to move off harness at some point. Change-Id: If3921e4f8bdd2c5973e30793267308ac9fa0d951 Signed-off-by: Guillaume Boutry --- ops-sunbeam/ops_sunbeam/test_utils.py | 6 ++++-- test-requirements.txt | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ops-sunbeam/ops_sunbeam/test_utils.py b/ops-sunbeam/ops_sunbeam/test_utils.py index 260f39b0..1cb3a89f 100644 --- a/ops-sunbeam/ops_sunbeam/test_utils.py +++ b/ops-sunbeam/ops_sunbeam/test_utils.py @@ -52,13 +52,15 @@ from ops import ( framework, model, ) +from ops._private.harness import ( + _TestingModelBackend, + _TestingPebbleClient, +) from ops.jujucontext import ( _JujuContext, ) from ops.testing import ( Harness, - _TestingModelBackend, - _TestingPebbleClient, ) TEST_CA = """-----BEGIN CERTIFICATE----- diff --git a/test-requirements.txt b/test-requirements.txt index 043e6032..afa1f93d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,13 @@ stestr coverage tenacity # ops-sunbeam -ops # all charms +ops[testing]>=2.17.0 # all charms, private paths have moved lightkube # almost all charms pwgen # keystone-k8s python-keystoneclient # keystone-k8s cryptography # neutron-k8s jsonschema # neutron-k8s pytest-interface-tester # barbican-k8s -ops-scenario<7 # barbican-k8s, see bug https://github.com/canonical/pytest-interface-tester/issues/23 pydantic # traefik-k8s ingress lib requests # cinder-ceph-k8s netifaces # cinder-ceph-k8s