Skip to content

Commit 33960e4

Browse files
committed
Fix StreamConfig omitempty fields for nats-server>2.12
1 parent dd67af0 commit 33960e4

File tree

1 file changed

+19
-5
lines changed

1 file changed

+19
-5
lines changed

nats/tests/test_js.py

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3100,7 +3100,7 @@ async def error_handler(e):
31003100
assert config.template_owner == None
31013101

31023102
version = nc.connected_server_version
3103-
if version.major == 2 and version.minor < 9:
3103+
if version.major == 2 and (version.minor < 9 or version.minor > 12):
31043104
assert config.allow_direct == None
31053105
else:
31063106
assert config.allow_direct == False
@@ -4040,14 +4040,21 @@ async def error_handler(e):
40404040
assert sinfo.config.max_msgs == -1
40414041
assert sinfo.config.max_bytes == -1
40424042
assert sinfo.config.discard == "new"
4043-
assert sinfo.config.max_age == 0
4043+
version = nc.connected_server_version
4044+
if version.major == 2 and version.minor > 12:
4045+
assert sinfo.config.max_age is None
4046+
else:
4047+
assert sinfo.config.max_age == 0
40444048
assert sinfo.config.max_msgs_per_subject == -1
40454049
assert sinfo.config.max_msg_size == -1
40464050
assert sinfo.config.storage == "file"
40474051
assert sinfo.config.num_replicas == 1
40484052
assert sinfo.config.allow_rollup_hdrs == True
40494053
assert sinfo.config.allow_direct == True
4050-
assert sinfo.config.mirror_direct == False
4054+
if version.major == 2 and version.minor > 12:
4055+
assert sinfo.config.mirror_direct is None
4056+
else:
4057+
assert sinfo.config.mirror_direct == False
40514058

40524059
bucketname = "".join(random.SystemRandom().choice(string.ascii_letters) for _ in range(10))
40534060
obs = await js.create_object_store(bucket=bucketname)
@@ -4844,7 +4851,11 @@ async def test_stream_compression(self):
48444851
compression="none",
48454852
)
48464853
sinfo = await js.stream_info("NONE")
4847-
assert sinfo.config.compression == nats.js.api.StoreCompression.NONE
4854+
version = nc.connected_server_version
4855+
if version.major == 2 and version.minor > 12:
4856+
assert sinfo.config.compression is None
4857+
else:
4858+
assert sinfo.config.compression == nats.js.api.StoreCompression.NONE
48484859

48494860
# By default it should be using 'none' as the configured compression value.
48504861
js = nc.jetstream()
@@ -4853,7 +4864,10 @@ async def test_stream_compression(self):
48534864
subjects=["quux"],
48544865
)
48554866
sinfo = await js.stream_info("NONE2")
4856-
assert sinfo.config.compression == nats.js.api.StoreCompression.NONE
4867+
if version.major == 2 and version.minor > 12:
4868+
assert sinfo.config.compression is None
4869+
else:
4870+
assert sinfo.config.compression == nats.js.api.StoreCompression.NONE
48574871
await nc.close()
48584872

48594873
@async_test

0 commit comments

Comments
 (0)