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

Revert "Disable "empty repository" Git test" 

This reverts commit 60571c08f1.

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-07-03 12:17:01 +02:00
parent d4e8d54d58
commit 995cab57d4
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
1 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
internal/controller/gitrepository_controller_test.go
View File

@ -219,62 +219,57 @@ func TestGitRepositoryReconciler_Reconcile(t *testing.T) {
testSuspendedObjectDeleteWithArtifact(ctx, g, obj) testSuspendedObjectDeleteWithArtifact(ctx, g, obj)
} }
// TODO(hidde): Re-enable this test. func TestGitRepositoryReconciler_reconcileSource_emptyRepository(t *testing.T) {
// It is currently disabled because it fails on machines with Git version g := NewWithT(t)
// >=v2.41.0 due to changes to commands used by the test server. Causing
// the test server to return an error when cloning an empty repository, server, err := gittestserver.NewTempGitServer()
// instead of yielding an empty object. g.Expect(err).NotTo(HaveOccurred())
//func TestGitRepositoryReconciler_reconcileSource_emptyRepository(t *testing.T) { defer os.RemoveAll(server.Root())
// g := NewWithT(t) server.AutoCreate()
// g.Expect(server.StartHTTP()).To(Succeed())
// server, err := gittestserver.NewTempGitServer() defer server.StopHTTP()
// g.Expect(err).NotTo(HaveOccurred())
// defer os.RemoveAll(server.Root()) obj := &sourcev1.GitRepository{
// server.AutoCreate() ObjectMeta: metav1.ObjectMeta{
// g.Expect(server.StartHTTP()).To(Succeed()) GenerateName: "empty-",
// defer server.StopHTTP() Generation: 1,
// },
// obj := &sourcev1.GitRepository{ Spec: sourcev1.GitRepositorySpec{
// ObjectMeta: metav1.ObjectMeta{ Interval: metav1.Duration{Duration: interval},
// GenerateName: "empty-", Timeout: &metav1.Duration{Duration: timeout},
// Generation: 1, URL: server.HTTPAddress() + "/test.git",
// }, },
// Spec: sourcev1.GitRepositorySpec{ }
// Interval: metav1.Duration{Duration: interval},
// Timeout: &metav1.Duration{Duration: timeout}, clientBuilder := fakeclient.NewClientBuilder().
// URL: server.HTTPAddress() + "/test.git", WithScheme(testEnv.GetScheme()).
// }, WithStatusSubresource(&sourcev1.GitRepository{})
// }
// r := &GitRepositoryReconciler{
// clientBuilder := fakeclient.NewClientBuilder(). Client: clientBuilder.Build(),
// WithScheme(testEnv.GetScheme()). EventRecorder: record.NewFakeRecorder(32),
// WithStatusSubresource(&sourcev1.GitRepository{}) Storage: testStorage,
// patchOptions: getPatchOptions(gitRepositoryReadyCondition.Owned, "sc"),
// r := &GitRepositoryReconciler{ }
// Client: clientBuilder.Build(),
// EventRecorder: record.NewFakeRecorder(32), g.Expect(r.Client.Create(context.TODO(), obj)).ToNot(HaveOccurred())
// Storage: testStorage, defer func() {
// patchOptions: getPatchOptions(gitRepositoryReadyCondition.Owned, "sc"), g.Expect(r.Client.Delete(context.TODO(), obj)).ToNot(HaveOccurred())
// } }()
//
// g.Expect(r.Client.Create(context.TODO(), obj)).ToNot(HaveOccurred()) var commit git.Commit
// defer func() { var includes artifactSet
// g.Expect(r.Client.Delete(context.TODO(), obj)).ToNot(HaveOccurred()) sp := patch.NewSerialPatcher(obj, r.Client)
// }()
// got, err := r.reconcileSource(context.TODO(), sp, obj, &commit, &includes, t.TempDir())
// var commit git.Commit assertConditions := []metav1.Condition{
// var includes artifactSet *conditions.TrueCondition(sourcev1.FetchFailedCondition, "EmptyGitRepository", "git repository is empty"),
// sp := patch.NewSerialPatcher(obj, r.Client) }
// g.Expect(obj.Status.Conditions).To(conditions.MatchConditions(assertConditions))
// got, err := r.reconcileSource(context.TODO(), sp, obj, &commit, &includes, t.TempDir()) g.Expect(err).To(HaveOccurred())
// assertConditions := []metav1.Condition{ g.Expect(got).To(Equal(sreconcile.ResultEmpty))
// *conditions.TrueCondition(sourcev1.FetchFailedCondition, "EmptyGitRepository", "git repository is empty"), g.Expect(commit).ToNot(BeNil())
// } }
// g.Expect(obj.Status.Conditions).To(conditions.MatchConditions(assertConditions))
// g.Expect(err).To(HaveOccurred())
// g.Expect(got).To(Equal(sreconcile.ResultEmpty))
// g.Expect(commit).ToNot(BeNil())
//}
func TestGitRepositoryReconciler_reconcileSource_authStrategy(t *testing.T) { func TestGitRepositoryReconciler_reconcileSource_authStrategy(t *testing.T) {
type options struct { type options struct {