Remove TestUpdateWhenRemoteChangesMerged
This test is redundant as same case is tested in
TestUpdateUniverseRemoteBranch
Change-Id: Ic1891a4114208ee189e8596c9a4357a5e80a17d3
diff --git a/project/project_test.go b/project/project_test.go
index e51fee0..89b7170 100644
--- a/project/project_test.go
+++ b/project/project_test.go
@@ -1395,73 +1395,6 @@
testLocalBranchesAreUpdated(t, true, false)
}
-// TestUpdateWhenRemoteChangesMerged checks that UpdateUniverse can pull from a
-// non-master remote branch if the local changes were merged somehwere else(gerrit)
-// before being pushed to remote
-func TestUpdateWhenRemoteChangesMerged(t *testing.T) {
- localProjects, fake, cleanup := setupUniverse(t)
- defer cleanup()
- if err := fake.UpdateUniverse(false); err != nil {
- t.Fatal(err)
- }
-
- gitRemote := gitutil.New(fake.X, gitutil.UserNameOpt("John Doe"), gitutil.UserEmailOpt("john.doe@example.com"), gitutil.RootDirOpt(fake.Projects[localProjects[1].Name]))
- gr := git.NewGit(fake.Projects[localProjects[1].Name])
- if err := gitRemote.CreateAndCheckoutBranch("non-master"); err != nil {
- t.Fatal(err)
- }
-
- gitLocal := gitutil.New(fake.X, gitutil.UserNameOpt("John Doe"), gitutil.UserEmailOpt("john.doe@example.com"), gitutil.RootDirOpt(localProjects[1].Path))
- gl := git.NewGit(localProjects[1].Path)
- if err := gl.Fetch("origin", git.PruneOpt(true)); err != nil {
- t.Fatal(err)
- }
-
- // checkout branch in local repo
- if err := gitLocal.CheckoutBranch("non-master"); err != nil {
- t.Fatal(err)
- }
-
- // creating two sepearte commit and merging them in remote
- writeFile(t, fake.X, fake.Projects[localProjects[1].Name], "file1", "file1")
- file1CommitRev, _ := gr.CurrentRevision()
- if err := gitRemote.CheckoutBranch("master"); err != nil {
- t.Fatal(err)
- }
- if err := gitRemote.CreateAndCheckoutBranch("branchToMerge"); err != nil {
- t.Fatal(err)
- }
-
- writeFile(t, fake.X, fake.Projects[localProjects[1].Name], "file2", "file2")
-
- if err := gitRemote.CheckoutBranch("non-master"); err != nil {
- t.Fatal(err)
- }
- if err := gitRemote.Merge("branchToMerge"); err != nil {
- t.Fatal(err)
- }
- mergeCommitRev, _ := gr.CurrentRevision()
-
- if err := gl.Fetch("origin", git.PruneOpt(true)); err != nil {
- t.Fatal(err)
- }
-
- // Cherry pick creation of file1
- if err := gitLocal.CherryPick(file1CommitRev); err != nil {
- t.Fatal(err)
- }
-
- if err := fake.UpdateUniverse(false); err != nil {
- t.Fatal(err)
- }
-
- // It rebased properly and pulled latest changes
- localRev, _ := gl.CurrentRevision()
- if mergeCommitRev != localRev {
- t.Fatalf("Current commit is %v, it should be %v\n", localRev, mergeCommitRev)
- }
-}
-
func TestFileImportCycle(t *testing.T) {
jirix, cleanup := jiritest.NewX(t)
defer cleanup()
