Check new state implementation

We want to use check-new option to check options after transition, thus the next state after initial Signed-off-by: Petr Fedchenkov <[email protected]>
lf-edge · Oct 20, 2023 · 13844e3 · 13844e3
1 parent 523cad4
commit 13844e3
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/tests/app/app_test.go b/tests/app/app_test.go
@@ -26,7 +26,7 @@ type appState struct {
 // This test wait for the app's state with a timewait.
 var (
 	timewait = flag.Duration("timewait", 10*time.Minute, "Timewait for items waiting")
-	_        = flag.Bool("check-new", false, "Check only new info messages")
+	checkNew = flag.Bool("check-new", false, "Check for the new state after state transition")
 	tc       *projects.TestContext
 	states   map[string][]appState
 )
@@ -109,6 +109,15 @@ func checkState(eveState *eve.State, state string, appNames []string) error {
 	if len(states) == len(appNames) {
 		for _, appName := range appNames {
 			if !checkNewLastState(appName, state) {
+				if *checkNew {
+					// first one is no info from controller
+					// the second is initial state
+					// we want to wait for the third or later, thus new state
+					if len(states[appName]) <= 2 {
+						fmt.Println(utils.AddTimestamp(fmt.Sprintf("\tappName %s wait for new state", appName)))
+						return nil
+					}
+				}
 				out += utils.AddTimestamp(fmt.Sprintf(
 					"app %s state %s\n",
 					appName, state))

diff --git a/tests/network/nw_test.go b/tests/network/nw_test.go
@@ -22,7 +22,7 @@ type nwState struct {
 // This test wait for the network's state with a timewait.
 var (
 	timewait = flag.Duration("timewait", time.Minute, "Timewait for items waiting")
-	_        = flag.Bool("check-new", false, "Check only new info messages")
+	checkNew = flag.Bool("check-new", false, "Check for the new state after state transition")
 	tc       *projects.TestContext
 	states   map[string][]nwState
 )
@@ -96,6 +96,15 @@ func checkState(eveState *eve.State, state string, netNames []string) error {
 	if len(states) == len(netNames) {
 		for _, netName := range netNames {
 			if !checkNewLastState(netName, state) {
+				if *checkNew {
+					// first one is no info from controller
+					// the second is initial state
+					// we want to wait for the third or later, thus new state
+					if len(states[netName]) <= 2 {
+						fmt.Println(utils.AddTimestamp(fmt.Sprintf("\tnetName %s wait for new state", netName)))
+						return nil
+					}
+				}
 				out += fmt.Sprintf(
 					"network %s state %s\n",
 					netName, state)

diff --git a/tests/volume/vol_test.go b/tests/volume/vol_test.go
@@ -22,7 +22,7 @@ type volState struct {
 // This test wait for the volume's state with a timewait.
 var (
 	timewait = flag.Duration("timewait", time.Minute, "Timewait for items waiting")
-	_        = flag.Bool("check-new", false, "Check only new info messages")
+	checkNew = flag.Bool("check-new", false, "Check for the new state after state transition")
 	tc       *projects.TestContext
 	states   map[string][]volState
 )
@@ -100,6 +100,15 @@ func checkState(eveState *eve.State, state string, volNames []string) error {
 	if len(states) == len(volNames) {
 		for _, volName := range volNames {
 			if !checkNewLastState(volName, state) {
+				if *checkNew {
+					// first one is no info from controller
+					// the second is initial state
+					// we want to wait for the third or later, thus new state
+					if len(states[volName]) <= 2 {
+						fmt.Println(utils.AddTimestamp(fmt.Sprintf("\tvolName %s wait for new state", volName)))
+						return nil
+					}
+				}
 				out += fmt.Sprintf(
 					"volume %s state %s\n",
 					volName, state)