Re-expose Harness in the ops.testing namespace.

ops/testing.py

@@ -0,0 +1,67 @@
+# Copyright 2021 Canonical Ltd.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Infrastructure to build unit tests for charms using the ops library."""
+
+from ._private.harness import (
+    ActionFailed,
+    ActionOutput,
+    AppUnitOrName,
+    CharmBase,  # noqa: F401
+    CharmMeta,  # noqa: F401
+    CharmType,
+    Container,  # noqa: F401
+    ExecArgs,
+    ExecHandler,
+    ExecProcess,  # noqa: F401
+    ExecResult,
+    Harness,
+    ReadableBuffer,
+    RelationNotFoundError,  # noqa: F401
+    RelationRole,  # noqa: F401
+    YAMLStringOrFile,
+    charm,  # noqa: F401
+    framework,  # noqa: F401
+    model,  # noqa: F401
+    pebble,  # noqa: F401
+    storage,  # noqa: F401
+)
+
+__all__ = [
+    # Expose the Harness functionality in this namespace.
+    'ActionFailed',
+    'ActionOutput',
+    'AppUnitOrName',
+    'CharmType',
+    'ExecArgs',
+    'ExecHandler',
+    'ExecResult',
+    'Harness',
+    'ReadableBuffer',
+    'YAMLStringOrFile',
+]
+__all__.extend([
+    # These names are exposed for backwards compatibility.
+    'CharmBase',
+    'CharmMeta',
+    'Container',
+    'ExecProcess',
+    'RelationNotFoundError',
+    'RelationRole',
+    'charm',
+    'framework',
+    'model',
+    'pebble',
+    'storage',
+])

test/test_testing.py

@@ -39,10 +39,11 @@
 import ops
 import ops.testing
 from ops import pebble
+from ops._private.harness import _TestingPebbleClient
 from ops.jujuversion import JujuVersion
 from ops.model import _ModelBackend
 from ops.pebble import FileType
-from ops.testing import ExecResult, _TestingPebbleClient
+from ops.testing import ExecResult
 
 is_linux = platform.system() == 'Linux'
 
@@ -6888,7 +6889,7 @@ def get_change(_: ops.pebble.Client, change_id: str):
                 'spawn-time': '2021-02-10T04:36:22.118970777Z',
             })
 
-        monkeypatch.setattr(ops.testing._TestingPebbleClient, 'get_change', get_change)
+        monkeypatch.setattr(_TestingPebbleClient, 'get_change', get_change)
         harness.pebble_notify(
             'foo',
             '123',