From f373c1bdd9caca2825f420d302122e48b2b240e0 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Mon, 12 Aug 2024 15:10:21 -0400 Subject: [PATCH] really run those tests --- .github/workflows/ci.yml | 137 ++++++++++-------- .../integrations/files/file_data_source.py | 3 + 2 files changed, 79 insertions(+), 61 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb9731d..2879f9e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.8"] services: redis: @@ -43,8 +43,8 @@ jobs: - name: Install poetry uses: abatilo/actions-poetry@7b6d33e44b4f08d7021a1dee3c044e9c253d6439 - - uses: ./.github/actions/build - - uses: ./.github/actions/build-docs + # - uses: ./.github/actions/build + # - uses: ./.github/actions/build-docs - name: Run tests run: make test @@ -57,6 +57,21 @@ jobs: - run: make test - run: make test - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test + - run: make test - name: Verify typehints run: make lint @@ -76,61 +91,61 @@ jobs: test_service_port: 9000 token: ${{ secrets.GITHUB_TOKEN }} - windows: - runs-on: windows-latest - - defaults: - run: - shell: powershell - - strategy: - fail-fast: false - matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] - - steps: - - uses: actions/checkout@v4 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - - - name: Setup DynamoDB - run: | - $ProgressPreference = "SilentlyContinue" - iwr -outf dynamo.zip https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.zip - mkdir dynamo - Expand-Archive -Path dynamo.zip -DestinationPath dynamo - cd dynamo - cmd /c "START /b java -Djava.library.path=./DynamoDBLocal_lib -jar ./DynamoDBLocal.jar" - - - name: Setup Consul - run: | - $ProgressPreference = "SilentlyContinue" - iwr -outf consul.zip https://releases.hashicorp.com/consul/1.4.2/consul_1.4.2_windows_amd64.zip - mkdir consul - Expand-Archive -Path consul.zip -DestinationPath consul - cd consul - sc.exe create "Consul" binPath="$(Get-Location)/consul.exe agent -dev" - sc.exe start "Consul" - - - name: Setup Redis - run: | - $ProgressPreference = "SilentlyContinue" - iwr -outf redis.zip https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.zip - mkdir redis - Expand-Archive -Path redis.zip -DestinationPath redis - cd redis - ./redis-server --service-install - ./redis-server --service-start - Start-Sleep -s 5 - ./redis-cli ping - - - name: Install poetry - uses: abatilo/actions-poetry@7b6d33e44b4f08d7021a1dee3c044e9c253d6439 - - - name: Install requirements - run: poetry install --all-extras - - - name: Run tests - run: make test + # windows: + # runs-on: windows-latest + # + # defaults: + # run: + # shell: powershell + # + # strategy: + # fail-fast: false + # matrix: + # python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + # + # steps: + # - uses: actions/checkout@v4 + # - name: Set up Python ${{ matrix.python-version }} + # uses: actions/setup-python@v4 + # with: + # python-version: ${{ matrix.python-version }} + # + # - name: Setup DynamoDB + # run: | + # $ProgressPreference = "SilentlyContinue" + # iwr -outf dynamo.zip https://s3-us-west-2.amazonaws.com/dynamodb-local/dynamodb_local_latest.zip + # mkdir dynamo + # Expand-Archive -Path dynamo.zip -DestinationPath dynamo + # cd dynamo + # cmd /c "START /b java -Djava.library.path=./DynamoDBLocal_lib -jar ./DynamoDBLocal.jar" + # + # - name: Setup Consul + # run: | + # $ProgressPreference = "SilentlyContinue" + # iwr -outf consul.zip https://releases.hashicorp.com/consul/1.4.2/consul_1.4.2_windows_amd64.zip + # mkdir consul + # Expand-Archive -Path consul.zip -DestinationPath consul + # cd consul + # sc.exe create "Consul" binPath="$(Get-Location)/consul.exe agent -dev" + # sc.exe start "Consul" + # + # - name: Setup Redis + # run: | + # $ProgressPreference = "SilentlyContinue" + # iwr -outf redis.zip https://github.com/MicrosoftArchive/redis/releases/download/win-3.0.504/Redis-x64-3.0.504.zip + # mkdir redis + # Expand-Archive -Path redis.zip -DestinationPath redis + # cd redis + # ./redis-server --service-install + # ./redis-server --service-start + # Start-Sleep -s 5 + # ./redis-cli ping + # + # - name: Install poetry + # uses: abatilo/actions-poetry@7b6d33e44b4f08d7021a1dee3c044e9c253d6439 + # + # - name: Install requirements + # run: poetry install --all-extras + # + # - name: Run tests + # run: make test diff --git a/ldclient/impl/integrations/files/file_data_source.py b/ldclient/impl/integrations/files/file_data_source.py index ea1e40e..7405740 100644 --- a/ldclient/impl/integrations/files/file_data_source.py +++ b/ldclient/impl/integrations/files/file_data_source.py @@ -115,6 +115,7 @@ def _load_file(self, path, all_data): with open(path, 'r') as f: content = f.read() parsed = self._parse_content(content) + logger.warning('Parsed content: %s' % parsed) for key, flag in parsed.get('flags', {}).items(): _sanitize_json_item(flag) self._add_item(all_data, FEATURES, flag) @@ -220,4 +221,6 @@ def _check_file_times(self): ret[path] = os.path.getmtime(path) except: ret[path] = None + + logger.warning('File %s last modified at %s' % (path, ret[path])) return ret