Fix test: default branch name was unstable #4882

t-kikuc · 2024-04-19T02:51:14Z

What this PR does / why we need it:

I made default branch name in the test fixed to master.
This change does not affect the production code.

The Problem I faced
make test/go failed locally, although it succeeded in CI.

--- FAIL: TestClone (0.74s)
    client_test.go:84: 
                Error Trace:    /dev/pipecd/pkg/git/client_test.go:84
                Error:          Received unexpected error:
                                failed to clone from local: exit status 128
                Test:           TestClone
FAIL
FAIL    github.com/pipe-cd/pipecd/pkg/git       1.311s

The Cause

My local git command uses main as default branch, but the test uses master.

pipecd/pkg/git/client_test.go

Line 83 in 14eb473

repo12, err := c.Clone(ctx, "repo-1", filepath.Join(faker.dir, "test-clone-org/repo-1"), "master", repo12Path)
CI passed the test because it uses master by default.
cf. https://github.com/pipe-cd/pipecd/actions/runs/8746544045/job/24003580952#step:2:30

Which issue(s) this PR fixes:

N/A

Does this PR introduce a user-facing change?: no

How are users affected by this change: no
Is this breaking change: no
How to migrate (if breaking change): no

Signed-off-by: t-kikuc <tkikuchi07f@gmail.com>

codecov · 2024-04-19T02:55:41Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 29.22%. Comparing base (14eb473) to head (b63e3eb).

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4882      +/-   ##
==========================================
- Coverage   29.23%   29.22%   -0.02%     
==========================================
  Files         318      318              
  Lines       40597    40597              
==========================================
- Hits        11870    11864       -6     
- Misses      27787    27793       +6     
  Partials      940      940

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

khanhtc1202

Great catch, thank you ⚾

ffjlabo

Exellent! 🚀

Signed-off-by: t-kikuc <tkikuchi07f@gmail.com>

Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com>

#4883 #4887 #4885 #4886 #4884 #4880 (#4890) * Update contributors list (#4866) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Use valid semver in run/pipecd command (#4851) * Use valid semver in run/pipecd command Signed-off-by: David <19214156+dgannon991@users.noreply.github.com> * Swapped to simpler local version Signed-off-by: David Gannon <19214156+dgannon991@users.noreply.github.com> * Include a comment explaining why we hard coded Signed-off-by: David Gannon <19214156+dgannon991@users.noreply.github.com> --------- Signed-off-by: David <19214156+dgannon991@users.noreply.github.com> Signed-off-by: David Gannon <19214156+dgannon991@users.noreply.github.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Support Canary & Blue/Green for ECS by `pipectl init` (#4801) * Add expected YAML for kustomize Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Add Kustomize pattern for pipectl init Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Add Helm pattern for pipectl init Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Add options for Helm Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * fix typo Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Add ECS canary for pipectl init Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Add pipectl init status Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * add init cmd to pipectl doc Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * add pipectl init explanation Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * fi pipectl init status Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Embed the simple AnalysisStage in pipeline by default Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Merge fix origin/master into pipectl-init-ecs-canary Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * fix prompt message and default value Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Fix output YAML structure by generic structs Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Support Blue/Green for ECS by pipectl init Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * omitempty Percentage Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Changed default values for simpler config Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Rename funcs to avoid name conflicts with other platforms Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> --------- Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Co-authored-by: Khanh Tran <32532742+khanhtc1202@users.noreply.github.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * [doc] Fix typo x2 in DeploymentChain (#4872) * Fix typo: archive->achieve Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Fix type: deployment->development Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Fix typos of 'achieve' and 'under development' in older docs Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> --------- Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * docs: added install method (#4875) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Fix unable to use SecretEncryption and Attachment features at the same time (#4855) * Add test to mention error with go templating Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Reimplement sourceprosser logic Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * SourceProssesor without processor should be marked as error Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Add test Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Enable perform template processing in chain Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Fix typo Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> --------- Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Add a caution comment of scrape_interval (#4869) * Add caution comment of scrape_interval Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Remove concrete value Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> * Fix to commit hash of v0.47.0 to fix the ref position Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> --------- Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Rewrite pipectl installation docs (#4877) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Fix typo (#4878) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Set initial-branch on git init (#4882) Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Update contributors list (#4883) Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Bump golang.org/x/net from 0.17.0 to 0.23.0 (#4887) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Bump golang.org/x/net in /tool/actions-plan-preview (#4885) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Bump golang.org/x/net from 0.17.0 to 0.23.0 in /tool/actions-gh-release (#4886) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Update default versions of kubectl, kustomize and helm in configuration-reference.md (#4884) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> * Add Homebrew Formula (#4880) Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> --------- Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com> Signed-off-by: David <19214156+dgannon991@users.noreply.github.com> Signed-off-by: David Gannon <19214156+dgannon991@users.noreply.github.com> Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Co-authored-by: David Gannon <19214156+dgannon991@users.noreply.github.com> Co-authored-by: Tetsuya Kikuchi <97105818+t-kikuc@users.noreply.github.com> Co-authored-by: YuyaKoda <29038315+ponkio-o@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Shinichi Nishimura <nshmura.s@gmail.com> Co-authored-by: Shohei Ueda <30958501+peaceiris@users.noreply.github.com>

Set initial-branch on git init

b63e3eb

Signed-off-by: t-kikuc <tkikuchi07f@gmail.com>

t-kikuc requested review from nghialv, khanhtc1202, kentakozuka and ffjlabo as code owners April 19, 2024 02:51

github-actions bot added the area/go label Apr 19, 2024

khanhtc1202 approved these changes Apr 19, 2024

View reviewed changes

ffjlabo approved these changes Apr 19, 2024

View reviewed changes

khanhtc1202 merged commit fb83928 into master Apr 19, 2024
13 of 14 checks passed

khanhtc1202 deleted the fix-git-client-test branch April 19, 2024 04:23

github-actions bot mentioned this pull request Apr 22, 2024

Release v0.47.1 #4889

Merged

khanhtc1202 pushed a commit that referenced this pull request Apr 22, 2024

Set initial-branch on git init (#4882)

490af89

Signed-off-by: t-kikuc <tkikuchi07f@gmail.com>

khanhtc1202 mentioned this pull request Apr 22, 2024

Cherry-pick #4866 #4851 #4801 #4872 #4875 #4855 #4869 #4877 #4878 #4882 #4883 #4887 #4885 #4886 #4884 #4880 #4890

Merged

khanhtc1202 pushed a commit that referenced this pull request Apr 22, 2024

Set initial-branch on git init (#4882)

3c0286d

Signed-off-by: t-kikuc <tkikuchi07f@gmail.com> Signed-off-by: khanhtc1202 <khanhtc1202@gmail.com>

github-actions bot mentioned this pull request May 13, 2024

Release v0.47.2 #4911

Merged

github-actions bot mentioned this pull request Jun 12, 2024

Release v0.47.3 #4967

Closed

github-actions bot mentioned this pull request Jul 4, 2024

Release v0.48.0 #5023

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix test: default branch name was unstable #4882

Fix test: default branch name was unstable #4882

t-kikuc commented Apr 19, 2024

codecov bot commented Apr 19, 2024

khanhtc1202 left a comment

ffjlabo left a comment

Fix test: default branch name was unstable #4882

Fix test: default branch name was unstable #4882

Conversation

t-kikuc commented Apr 19, 2024

codecov bot commented Apr 19, 2024

Codecov Report

khanhtc1202 left a comment

Choose a reason for hiding this comment

ffjlabo left a comment

Choose a reason for hiding this comment