tt: update error message text

Make some error messages text more meaningful.

Author: psergee

cli/running/running.go

@@ -355,14 +355,16 @@ func collectInstancesFromAppDir(appDir string, selectedInstName string) (
 
 		if instance.Configuration, err = loadInstanceConfig(instance.ClusterConfigPath,
 			instance.InstName); err != nil {
-			return instances, err
+			return instances, fmt.Errorf("error loading instance %q configuration from "+
+				"config %q: %w", instance.InstName, instance.ClusterConfigPath, err)
 		}
 
 		instance.AppName = filepath.Base(appDir)
 		instance.SingleApp = false
 		if instance.InstanceScript, err = findInstanceScriptInAppDir(appDir, instance.InstName,
 			appDirFiles.clusterCfgPath, appDirFiles.defaultLuaPath); err != nil {
-			return instances, err
+			return instances, fmt.Errorf("cannot find instance script for %q in config %q: %w ",
+				instance.InstName, appDirFiles.clusterCfgPath, err)
 		}
 		instances = append(instances, instance)
 	}
@@ -542,7 +544,7 @@ func CollectInstancesForApps(appList []util.AppListEntry, cliOpts *config.CliOpt
 		appName := strings.TrimSuffix(appInfo.Name, ".lua")
 		collectedInstances, err := CollectInstances(appName, instEnabledPath)
 		if err != nil {
-			return instances, fmt.Errorf("%s: can't find an application init file: %s",
+			return instances, fmt.Errorf("can't collect instance information for %s: %w",
 				appName, err)
 		}
 
@@ -665,7 +667,6 @@ func Run(runOpts *RunOpts, scriptPath string) error {
 	return err
 }
 
-// Status returns the status of the Instance.
 func Status(run *InstanceCtx) process_utils.ProcessState {
 	return process_utils.ProcessStatus(run.PIDFile)
 }

test/integration/check/test_check.py

@@ -18,7 +18,9 @@ def test_check_non_existent_file(tt_cmd, tmpdir_with_cfg):
     cmd = [tt_cmd, "check", "path-to-non-existent-file"]
     rc, output = run_command_and_get_output(cmd, cwd=tmpdir_with_cfg)
     assert rc == 1
-    assert re.search(r"can't find an application init file", output)
+    assert re.search(r"can\'t collect instance information for path-to-non-existent-file", output)
+    assert re.search(f"\"{os.path.join(tmpdir_with_cfg, 'path-to-non-existent-file')}\" " +
+                     "doesn\'t exist or not a directory", output)
 
 
 def test_check_incorrect_syntax_file(tt_cmd, tmpdir_with_cfg):

test/integration/cluster/test_cluster.py

@@ -132,7 +132,7 @@ def test_cluster_show_config_not_exist_app(tt_cmd, tmpdir_with_cfg):
     )
     show_output = instance_process.stdout.read()
 
-    expected = (r"   ⨯ unknown: can't find an application init file:")
+    expected = (r"   ⨯ can't collect instance information for unknown:")
     assert expected in show_output
 
 
@@ -243,8 +243,7 @@ def test_cluster_show_config_app_not_exist_instance(tt_cmd, tmpdir_with_cfg, app
     )
     show_output = instance_process.stdout.read()
 
-    expected = (f"   ⨯ {app_name}:unknown: " +
-                "can't find an application init file: " +
+    expected = (f"   ⨯ can't collect instance information for {app_name}:unknown: " +
                 "instance(s) not found")
     assert expected in show_output
 
@@ -536,7 +535,7 @@ def test_cluster_publish_no_app(tt_cmd, tmpdir_with_cfg):
     )
     publish_output = instance_process.stdout.read()
 
-    assert "⨯ non_exist: can't find an application init file:" in publish_output
+    assert "⨯ can\'t collect instance information for non_exist:" in publish_output
 
 
 @pytest.mark.parametrize("app_name", ["test_simple_app", "testsimpleapp"])
@@ -672,7 +671,7 @@ def test_cluster_publish_no_instance(tt_cmd, tmpdir_with_cfg, app_name):
     )
     publish_output = instance_process.stdout.read()
 
-    assert (f"⨯ {app_name}:non_exist: can't find an application init file:" +
+    assert (f"⨯ can't collect instance information for {app_name}:non_exist:" +
             " instance(s) not found") in publish_output
 
 

test/integration/connect/test_connect.py

@@ -523,7 +523,7 @@ def test_connect_to_single_instance_app(tt_cmd, tmpdir_with_cfg):
     # Connect to a wrong instance.
     ret, output = try_execute_on_instance(tt_cmd, tmpdir, "any_app", empty_file)
     assert not ret
-    assert re.search(r"   ⨯ any_app: can't find an application init file", output)
+    assert re.search(r"   ⨯ can\'t collect instance information for any_app", output)
 
     # Connect to the instance and execute a script.
     ret, output = try_execute_on_instance(tt_cmd, tmpdir, "test_app", empty_file)
@@ -609,8 +609,7 @@ def test_connect_to_multi_instances_app(tt_cmd, tmpdir_with_cfg):
     non_exist = app_name + ":" + "any_name"
     ret, output = try_execute_on_instance(tt_cmd, tmpdir, non_exist, empty_file)
     assert not ret
-    assert re.search(r"   ⨯ test_multi_app:any_name: can't find an application init file:"
-                     r" instance\(s\) not found", output)
+    assert re.search(rf"   ⨯ can't collect instance information for {non_exist}", output)
 
     # Connect to instances.
     for instance in instances:

test/integration/running/test_running.py

@@ -400,7 +400,7 @@ def test_running_multi_inst_app_error_cases(tt_cmd):
         )
         instance_process.wait(1)
         start_output = instance_process.stdout.readline()
-        assert re.search(r"can't find an application init file", start_output)
+        assert re.search(r"can\'t collect instance information for app2", start_output)
 
 
 def test_running_reread_config(tt_cmd, tmpdir):

test/integration/running/test_running_cluster.py

@@ -188,7 +188,8 @@ def test_running_base_functionality_error_cases(tt_cmd, tmpdir_with_cfg):
         text=True
     )
     start_output = instance_process.stdout.read()
-    assert r"can't find an application init file: instance(s) not found" in start_output
+    assert f"can't collect instance information for {app_name}:unknown: "
+    "instance(s) not found" in start_output
     rc = instance_process.wait(5)
     assert rc != 0