From bbea82a030161773f2ae978ee626c04e45610920 Mon Sep 17 00:00:00 2001
From: Waldemar Quevedo <wally@nats.io>
Date: Wed, 8 Oct 2025 02:55:43 -0700
Subject: [PATCH] Change nats-server test pkg import to nats.testing.server

Signed-off-by: Waldemar Quevedo <wally@nats.io>
---
 nats-server/.DS_Store                            | Bin 6148 -> 0 bytes
 nats-server/README.md                            |   4 ++--
 nats-server/src/nats/testing/__init__.py         |   1 +
 .../src/nats/{ => testing}/server/__init__.py    |   4 ++--
 nats-server/tests/test_server.py                 |   2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 nats-server/.DS_Store
 create mode 100644 nats-server/src/nats/testing/__init__.py
 rename nats-server/src/nats/{ => testing}/server/__init__.py (99%)

diff --git a/nats-server/.DS_Store b/nats-server/.DS_Store
deleted file mode 100644
index 2099c21ab0bca20bec48cfdd18fcc87563c13121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5Z-O8-BN@c6nYGJE!aN<@e*Qv0V8@)sfj5xm}X0pnnNk%tS{t~_&m<+
zZi}rsi|7o@elt5Wo6QH=%`nEey9m3CS&T6OipbF@5u7d!RZKDm1cf!8m}D<Op3Z`}
zWTD?Ug?q2F3Cq}&#b5U?1Bko_vp7n#PUnMHs<plSx~Pk$c<?4N_cA|Qq^>`|L+@J3
zI9S_$a1)L5k#%?>lgy8j@mv)|;TTfxZ=)oXxhoe*n5tS&2Sh_OMpkRN><#*Dd(iE#
z+V=9S*8#hKx>_~F(ecUo)#y2%Ch}EN$#M562O2ix+r}b;7$63S0b+m{*k!=n9-_G$
zAfFf@2L3$*cs|&mh>pQRqdGcZP%Qvp4W^ZVjlBfc*ajVgg+_>ga9s+hOSx$=xGslz
z+vGV03yr#*anpQo^W=5&!qwAZeOsk7?r5Zu7$63=8K`R4!u$UcKAF-cf4hV{Vt^R<
zV+`=x&>On&Qs!>`_Ih~N+Mti1D418E0Rr~cPXIW0j<i%z$8EGB&oNkN#8q%!l>^d`
NfFgtjV&DfD_yiF_Mpgg-

diff --git a/nats-server/README.md b/nats-server/README.md
index 4bc01a0a..bd8babb4 100644
--- a/nats-server/README.md
+++ b/nats-server/README.md
@@ -18,11 +18,11 @@ Requires Python 3.11+ and the NATS server binary in your PATH.
 
 ```python
 import asyncio
-import nats.server
+import nats.testing.server
 
 async def main():
     # Start server with auto port assignment
-    server = await nats.server.run(port=0, jetstream=True)
+    server = await nats.testing.server.run(port=0, jetstream=True)
     print(f"Server running on {server.host}:{server.port}")
 
     # Do something with the server...
diff --git a/nats-server/src/nats/testing/__init__.py b/nats-server/src/nats/testing/__init__.py
new file mode 100644
index 00000000..38dbf3d2
--- /dev/null
+++ b/nats-server/src/nats/testing/__init__.py
@@ -0,0 +1 @@
+"""Testing utilities for NATS."""
\ No newline at end of file
diff --git a/nats-server/src/nats/server/__init__.py b/nats-server/src/nats/testing/server/__init__.py
similarity index 99%
rename from nats-server/src/nats/server/__init__.py
rename to nats-server/src/nats/testing/server/__init__.py
index b80fa79e..b6c9b106 100644
--- a/nats-server/src/nats/server/__init__.py
+++ b/nats-server/src/nats/testing/server/__init__.py
@@ -6,10 +6,10 @@
 
 Example:
     >>> import asyncio
-    >>> import nats.server
+    >>> import nats.testing.server
     >>>
     >>> async def main():
-    ...     server = await nats.server.run(port=0)  # Auto port assignment
+    ...     server = await nats.testing.server.run(port=0)  # Auto port assignment
     ...     print(f"Server running on {server.host}:{server.port}")
     ...     await server.shutdown()
     >>> asyncio.run(main())
diff --git a/nats-server/tests/test_server.py b/nats-server/tests/test_server.py
index 1f011eed..59e3305d 100644
--- a/nats-server/tests/test_server.py
+++ b/nats-server/tests/test_server.py
@@ -10,7 +10,7 @@
 from urllib.parse import urlparse
 
 import pytest
-from nats.server import Server, ServerCluster, ServerError, run, run_cluster
+from nats.testing.server import Server, ServerCluster, ServerError, run, run_cluster
 
 
 class ServerInfo(TypedDict):