Merge pull request Backblaze#964 from Backblaze/fix_integration_test

Fix integration test & allow skipping changelog
reef-technologies · Nov 23, 2023 · a8a1614 · a8a1614
2 parents ae9138d + 62d09a2
commit a8a1614
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -28,6 +28,7 @@ jobs:
       - name: Run linters
         run: nox -vs lint
       - name: Validate new changelog entries
+        if: contains(github.event.pull_request.labels.*.name, '-changelog') == false
         run: if [ -z "$(git diff --diff-filter=A --name-only origin/${{ github.event.pull_request.base.ref }} changelog.d)" ];
           then echo no changelog item added; exit 1; fi
 

diff --git a/changelog.d/+skip_changelog.infrastructure.md b/changelog.d/+skip_changelog.infrastructure.md
@@ -0,0 +1,2 @@
+Allow skipping changelog for PRs marked with `-changelog` label.
+
diff --git a/test/integration/test_b2_command_line.py b/test/integration/test_b2_command_line.py
@@ -2742,7 +2742,7 @@ def assert_expected(file_info, expected=expected_file_info):
     assert_expected(copied_version['fileInfo'])
 
     download_output = b2_tool.should_succeed(
-        ['download-file-by-id', file_version['fileId'], tmp_path / 'downloaded_file']
+        ['download-file', f"b2id://{file_version['fileId']}", tmp_path / 'downloaded_file']
     )
     assert re.search(r'CacheControl: *max-age=3600', download_output)
     assert re.search(r'ContentDisposition: *attachment', download_output)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Allow skipping changelog for PRs marked with `-changelog` label.