Disable "empty repository" Git test

This is required because the test fails with Git >=v2.41.0 due to
changes to commands used by the Git test server. Causing the server to
return an error when cloning an empty repository, instead of yielding
an empty object.

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-06-23 16:51:37 +02:00
parent 2f4b200571
commit 60571c08f1
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
1 changed files with 56 additions and 51 deletions

View File

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