Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions .github/actions/check/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@ runs:
shell: bash
run: make start-contract-test-service-bg

- name: Run contract tests v2
if: ${{ inputs.flaky != 'true' }}
uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1
with:
test_service_port: 9000
enable_persistence_tests: true
token: ${{ inputs.token }}
stop_service: 'false'

- name: Run contract tests v3
if: ${{ inputs.flaky != 'true' }}
uses: launchdarkly/gh-actions/actions/contract-tests@contract-tests-v1
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ start-contract-test-service-bg:
@make start-contract-test-service >$(TEMP_TEST_OUTPUT) 2>&1 &

run-contract-tests:
@curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/v2/downloader/run.sh \
| VERSION=v2 PARAMS="-url http://localhost:9000 -debug -stop-service-at-end $(TEST_HARNESS_PARAMS)" sh
@curl -s https://raw.githubusercontent.com/launchdarkly/sdk-test-harness/v3/downloader/run.sh \
| VERSION=v3 PARAMS="-url http://localhost:9000 -debug -stop-service-at-end $(TEST_HARNESS_PARAMS)" sh

contract-tests: build-contract-tests start-contract-test-service-bg run-contract-tests

Expand Down
20 changes: 2 additions & 18 deletions contract-tests/client_entity.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,25 +53,9 @@ def initialize(log, config)
end

opts[:data_system_config] = data_system.build
elsif config[:streaming]
streaming = config[:streaming]
opts[:stream_uri] = streaming[:baseUri] unless streaming[:baseUri].nil?
opts[:payload_filter_key] = streaming[:filter] unless streaming[:filter].nil?
set_optional_time_prop(streaming, :initialRetryDelayMs, opts, :initial_reconnect_delay)
elsif config[:polling]
polling = config[:polling]
opts[:stream] = false
opts[:base_uri] = polling[:baseUri] unless polling[:baseUri].nil?
opts[:payload_filter_key] = polling[:filter] unless polling[:filter].nil?
set_optional_time_prop(polling, :pollIntervalMs, opts, :poll_interval)
else
opts[:use_ldd] = true
end

# Configure persistent data store for legacy (non-dataSystem) configurations
if !data_system_config && config[:persistentDataStore]
store, _store_mode = build_persistent_store(config[:persistentDataStore])
opts[:feature_store] = store
# Without a data system configuration, the client does not connect to LaunchDarkly for data.
opts[:data_system_config] = LaunchDarkly::DataSystem.custom.build
end

if config[:events]
Expand Down
4 changes: 0 additions & 4 deletions contract-tests/service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@
'all-flags-with-reasons',
'all-flags-client-side-only',
'all-flags-details-only-for-tracked-flags',
'filtering',
'filtering-strict',
'secure-mode-hash',
'tags',
'migrations',
Expand All @@ -55,8 +53,6 @@
'flag-change-listeners',
'flag-value-change-listeners',
'fdv1-fallback',
'retry-conformance-fdv1-streaming',
'retry-conformance-fdv1-polling',
],
}.to_json
end
Expand Down
Loading
Loading