itests: Fix ccupgrade post test

.circleci/config.yml

@@ -792,11 +792,6 @@ workflows:
           suite: itest-batch_deal
           target: "./itests/batch_deal_test.go"
       
-      - test:
-          name: test-itest-ccupgrade_post
-          suite: itest-ccupgrade_post
-          target: "./itests/ccupgrade_post_test.go"
-      
       - test:
           name: test-itest-ccupgrade
           suite: itest-ccupgrade

itests/ccupgrade_post_test.go

@@ -1,32 +0,0 @@
-package itests
-
-import (
-	"context"
-	"testing"
-
-	"github.com/filecoin-project/go-state-types/abi"
-	"github.com/stretchr/testify/require"
-
-	"github.com/filecoin-project/lotus/chain/types"
-	"github.com/filecoin-project/lotus/itests/kit"
-)
-
-func TestCCUpgradeAndPoSt(t *testing.T) {
-	kit.QuietMiningLogs()
-	t.Run("upgrade and then post", func(t *testing.T) {
-		ctx := context.Background()
-		n := runTestCCUpgrade(t)
-		ts, err := n.ChainHead(ctx)
-		require.NoError(t, err)
-		start := ts.Height()
-		// wait for a full proving period
-		t.Log("waiting for chain")
-
-		n.WaitTillChain(ctx, func(ts *types.TipSet) bool {
-			if ts.Height() > start+abi.ChainEpoch(2880) {
-				return true
-			}
-			return false
-		})
-	})
-}

itests/ccupgrade_test.go

@@ -29,7 +29,23 @@ func TestCCUpgrade(t *testing.T) {
 	//stm: @MINER_SECTOR_LIST_001
 	kit.QuietMiningLogs()
 
-	runTestCCUpgrade(t)
+	n := runTestCCUpgrade(t)
+
+	t.Run("post", func(t *testing.T) {
+		ctx := context.Background()
+		ts, err := n.ChainHead(ctx)
+		require.NoError(t, err)
+		start := ts.Height()
+		// wait for a full proving period
+		t.Log("waiting for chain")
+
+		n.WaitTillChain(ctx, func(ts *types.TipSet) bool {
+			if ts.Height() > start+abi.ChainEpoch(2880) {
+				return true
+			}
+			return false
+		})
+	})
 }
 
 func runTestCCUpgrade(t *testing.T) *kit.TestFullNode {