itests: Fix ccupgrade post test

.circleci/config.yml

@@ -786,11 +786,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_test.go

@@ -29,7 +29,31 @@ func TestCCUpgrade(t *testing.T) {
 	//stm: @MINER_SECTOR_LIST_001
 	kit.QuietMiningLogs()
 
-	runTestCCUpgrade(t)
+	var n *kit.TestFullNode
+
+	t.Run("upgrade", func(t *testing.T) {
+		n = runTestCCUpgrade(t)
+	})
+
+	t.Run("post", func(t *testing.T) {
+		if n == nil {
+			t.Fatal("post test depends on 'upgrade' test running first")
+		}
+
+		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 {