From f9adb8f352297b72ec087911f30bd30befeb5a5e Mon Sep 17 00:00:00 2001
From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 10 Jul 2025 14:55:23 -0400
Subject: [PATCH] [#3770] Fix v6 UTs

src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
 Fix globalOptions6WithServerTagsTest
---
 src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc b/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
index 93ecd8b491..726e5f98a7 100644
--- a/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
+++ b/src/lib/dhcpsrv/testutils/generic_cb_dhcp6_unittest.cc
@@ -3381,9 +3381,13 @@ GenericConfigBackendDHCPv6Test::createUpdateDeleteOption6Test() {
 
 void
 GenericConfigBackendDHCPv6Test::globalOptions6WithServerTagsTest() {
-    OptionDescriptorPtr opt_timezone1 = test_options_[0];
-    OptionDescriptorPtr opt_timezone2 = test_options_[6];
-    OptionDescriptorPtr opt_timezone3 = test_options_[7];
+    // Create test options without any client classes.
+    OptionDescriptorPtr opt_timezone1(new OptionDescriptor(*test_options_[0]));
+    opt_timezone1->client_classes_.clear();
+    OptionDescriptorPtr opt_timezone2(new OptionDescriptor(*test_options_[6]));
+    opt_timezone2->client_classes_.clear();
+    OptionDescriptorPtr opt_timezone3(new OptionDescriptor(*test_options_[7]));
+    opt_timezone3->client_classes_.clear();
 
     ASSERT_THROW(cbptr_->createUpdateOption6(ServerSelector::ONE("server1"),
                                              opt_timezone1),