conflict

Author: amrita-shrestha

tests/acceptance/features/cliCommands/backupConsistency.feature

@@ -1,4 +1,4 @@
-@env-config @backup-consistency
+@env-config
 Feature: backup consistency
   As a user
   I want to check my data for inconsistencies

tests/ociswrapper/ocis/ocis.go

@@ -40,14 +40,15 @@ func Stop() (bool, string) {
 	 	log.Println(fmt.Sprintf("Services running before terminating: %s with process and id: %v\n", listservice, pid))
 	 	process, err := os.FindProcess(pid)
 	 	err = process.Signal(syscall.SIGINT)
-        	if err != nil {
-        		if !strings.HasSuffix(err.Error(), "process already finished") {
-        			log.Fatalln(err)
-        		} else {
-        			return true, "oCIS server is already stopped"
-        		}
-        	}
-        	process.Wait()
+        if err != nil {
+       		if !strings.HasSuffix(err.Error(), "process already finished") {
+       			log.Fatalln(err)
+       		} else {
+       			return true, "oCIS server is already stopped"
+       		}
+		   }
+	    process.Wait()
+	   delete(runningCommands, "ocis")
 	}
 
 	cmd = nil
@@ -69,6 +70,8 @@ func Restart(envMap []string) (bool, string) {
 }
 
 func IsOcisRunning() bool {
+	pid, _ := runningCommands["ocis"]
+	log.Println(fmt.Sprintf("Services process id to terminate: %s\n", pid))
     if runningCommands["ocis"] > 0 {
         return true
     }

tests/ociswrapper/wrapper/handlers/handler.go

@@ -161,7 +161,7 @@ func StartOcisHandler(res http.ResponseWriter, req *http.Request) {
 		sendResponse(res, http.StatusOK, message)
 		return
 	}
-
+	common.Wg.Wait()
 	sendResponse(res, http.StatusInternalServerError, message)
 }