Merge branch 'v9' into mk/sc-232963/spec-to-lib

launchdarkly · Feb 9, 2024 · 5347bc8 · 5347bc8
2 parents eda8695 + 65406cc
commit 5347bc8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
@@ -82,4 +82,4 @@ runs:
  shell: bash
  # Add a brief sleep here to ensure the test service is ready to receive
  # requests
- run: sleep 10 && make run-contract-tests
+ run: make run-contract-tests
diff --git a/LaunchDarkly/LaunchDarkly/Models/Context/LDContext.swift b/LaunchDarkly/LaunchDarkly/Models/Context/LDContext.swift
@@ -43,6 +43,7 @@ public struct LDContext: Encodable, Equatable {
 
  init() {
  self.init(canonicalizedKey: LDContext.defaultKey(kind: Kind.user))
+ self.key = self.canonicalizedKey
  }
 
  struct Meta: Codable {

diff --git a/Makefile b/Makefile
@@ -12,7 +12,7 @@ start-contract-test-service-bg:
 
 run-contract-tests:
  @curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/master/downloader/run.sh \
- | VERSION=v2 PARAMS="-url http://localhost:8080 -debug -stop-service-at-end -skip-from ./ContractTests/testharness-suppressions.txt $(TEST_HARNESS_PARAMS)" sh
+ | VERSION=v2 PARAMS="-url http://localhost:8080 -debug -status-timeout 120 -stop-service-at-end -skip-from ./ContractTests/testharness-suppressions.txt $(TEST_HARNESS_PARAMS)" sh
 
 contract-tests: start-contract-test-service-bg run-contract-tests