fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #419 from darkowlzz/gitrepo-reconcileinclude-test-storage 

gitrepo-reconciler: reconcileInclude test assertion fixes
This commit is contained in:
Hidde Beydals 2021-08-06 22:10:58 +02:00 committed by GitHub
parent becd5f824c 47ab15d1c0
commit 170ae97358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/gitrepository_controller_test.go
View File

@ -690,7 +690,7 @@ func TestGitRepositoryReconciler_reconcileInclude(t *testing.T) {
g.Expect(err).NotTo(HaveOccurred())
storage, err := newTestStorage(server.HTTPServer)
g.Expect(err).NotTo(HaveOccurred())
defer os.RemoveAll(testStorage.BasePath)
defer os.RemoveAll(storage.BasePath)
dependencyInterval := 5 * time.Second
@ -735,8 +735,8 @@ func TestGitRepositoryReconciler_reconcileInclude(t *testing.T) {
},
},
includes: []include{
{name: "a", toPath: "a/"},
{name: "b", toPath: "b/"},
{name: "a", toPath: "a/", shouldExist: true},
{name: "b", toPath: "b/", shouldExist: true},
},
want: ctrl.Result{RequeueAfter: interval},
assertConditions: []metav1.Condition{
@ -871,7 +871,7 @@ func TestGitRepositoryReconciler_reconcileInclude(t *testing.T) {
g.Expect(got).To(Equal(tt.want))
for _, i := range tt.includes {
if i.toPath != "" {
expect := g.Expect(filepath.Join(testStorage.BasePath, i.toPath))
expect := g.Expect(filepath.Join(tmpDir, i.toPath))
if i.shouldExist {
expect.To(BeADirectory())
} else {
@ -879,9 +879,9 @@ func TestGitRepositoryReconciler_reconcileInclude(t *testing.T) {
}
}
if i.shouldExist {
g.Expect(filepath.Join(testStorage.BasePath, i.toPath)).Should(BeADirectory())
g.Expect(filepath.Join(tmpDir, i.toPath)).Should(BeADirectory())
} else {
g.Expect(filepath.Join(testStorage.BasePath, i.toPath)).ShouldNot(BeADirectory())
g.Expect(filepath.Join(tmpDir, i.toPath)).ShouldNot(BeADirectory())
}
}
})