Skip to content

Comments

remove conflict test#1336

Merged
sunkickr merged 2 commits intomainfrom
remove-conflict-test
Aug 3, 2023
Merged

remove conflict test#1336
sunkickr merged 2 commits intomainfrom
remove-conflict-test

Conversation

@sunkickr
Copy link
Contributor

@sunkickr sunkickr commented Aug 3, 2023

Description

Remove conflict test. Test currently finds a conflict with the latest version of runtime. This would be too confusing to users as there tests would fail and they would have no way to fix it

🎟 Issue(s)

Related #XXX

🧪 Functional Testing

List the functional testing steps to confirm this feature or fix.

📸 Screenshots

Add screenshots to illustrate the validity of these changes.

📋 Checklist

  • Rebased from the main (or release if patching) branch (before testing)
  • Ran make test before taking out of draft
  • Ran make lint before taking out of draft
  • Added/updated applicable tests
  • Tested against Astro-API (if necessary).
  • Tested against Houston-API and Astronomer (if necessary).
  • Communicated to/tagged owners of respective clients potentially impacted by these changes.
  • Updated any related documentation

@@ -536,8 +536,7 @@ func (d *DockerCompose) Pytest(pytestFile, customImageName, deployImageName, pyt

func (d *DockerCompose) UpgradeTest(newAirflowVersion, deploymentID, newImageName, customImage string, conflictTest, versionTest, dagTest bool, client astro.Client) error {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove conflictTest from the function too?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got you! #1797

@codecov
Copy link

codecov bot commented Aug 3, 2023

Codecov Report

Patch coverage: 100.00% and project coverage change: -0.01% ⚠️

Comparison is base (595721e) 86.92% compared to head (7c86e7d) 86.92%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1336      +/-   ##
==========================================
- Coverage   86.92%   86.92%   -0.01%     
==========================================
  Files         114      114              
  Lines       13874    13872       -2     
==========================================
- Hits        12060    12058       -2     
  Misses       1083     1083              
  Partials      731      731              
Files Changed Coverage Δ
cmd/airflow.go 89.02% <ø> (-0.03%) ⬇️
airflow/docker.go 83.47% <100.00%> (-0.02%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@sunkickr sunkickr merged commit fb0db40 into main Aug 3, 2023
@sunkickr sunkickr deleted the remove-conflict-test branch August 3, 2023 16:31
kushalmalani pushed a commit that referenced this pull request Aug 3, 2023
* remove conflict test

* fix test
@schnie schnie mentioned this pull request Jan 31, 2025
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants