Skip to content

Commit b5e3a25

Browse files
committed
Ignore Linux debug files, and remove logs
1 parent 27b6b5c commit b5e3a25

File tree

3 files changed

+1
-13
lines changed

3 files changed

+1
-13
lines changed

scripts/gha/desktop_tester.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def main(argv):
6565
for file_dir, _, file_names in os.walk(testapp_dir):
6666
for file_name in file_names:
6767
# match Testapp names, e.g. "Firebase Analytics Unity Testapp"
68-
if testapp_name in file_name.lower():
68+
if testapp_name in file_name.lower() and file_name.endswith("_s.debug"):
6969
testapps.append(os.path.join(file_dir, file_name))
7070

7171
if not testapps:
@@ -123,15 +123,13 @@ def run(self):
123123
open_process = subprocess.Popen(args=args)
124124
test_running = True
125125
time_until_timeout = 300 # Timeout of 300 seconds, or 5 minutes.
126-
logging.info("===== log_path: %s", log_path)
127126
while test_running and time_until_timeout > 0:
128127
time.sleep(5)
129128
time_until_timeout -= 5
130129
if os.path.exists(log_path):
131130
with open(log_path) as f:
132131
self.logs = f.read()
133132
test_running = "All tests finished" not in self.logs
134-
logging.info("===== Did I timeout? %d", time_until_timeout)
135133
open_process.kill()
136134
if platform.system() == 'Linux':
137135
# Linux seems to have a problem printing out too much information, so truncate it

scripts/gha/integration_testing/automated_testapp/AutomatedTestRunner.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,6 @@ private static string FormatLog(string condition, string stackTrace, LogType typ
102102
return string.Format("[{0}]({1}): {2}\n{3}\n", DateTime.Now, type, condition, stackTrace);
103103
}
104104

105-
float lastLogTime = 0;
106-
107105
// Runs through the tests, checking if the current one is done.
108106
// If so, logs the relevant information, and proceeds to the next test.
109107
public void Update() {
@@ -118,14 +116,9 @@ public void Update() {
118116

119117
if (currentTestIndex >= tests.Count) {
120118
if (Finished) {
121-
if (Time.time > lastLogTime + 5f) {
122-
UnityEngine.Debug.Log("===== Test was finished, waiting for some time to pass: " + Time.time + " " + endTime);
123-
lastLogTime = Time.time;
124-
}
125119
// No tests left to run.
126120
// Wait 5 seconds before notifying test lab manager so video can capture end of test.
127121
if (Time.time > endTime + 5f) {
128-
UnityEngine.Debug.Log("===== Enough time passed, marking stuff as complete");
129122
testLabManager.NotifyHarnessTestIsComplete();
130123
}
131124
} else {
@@ -143,7 +136,6 @@ public void Update() {
143136
}
144137
Finished = true;
145138
endTime = Time.time;
146-
UnityEngine.Debug.Log("===== Test was finished, starting to wait: " + Time.time + " " + endTime);
147139
}
148140
return;
149141
}

scripts/gha/integration_testing/automated_testapp/ftl_testapp_files/DesktopTestLabManager.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ private DesktopTestLabManager(int scenario, StreamWriter logWriter) {
3737
}
3838

3939
protected override void OnFinishTest() {
40-
UnityEngine.Debug.Log("===== TestLabManager OnFinishTest called");
4140
logWriter.Close();
4241
Application.Quit();
4342
}
@@ -61,7 +60,6 @@ public static TestLabManager Create() {
6160
}
6261
// Hard-coded scenario number. May be replaced with a number supplied via command line
6362
// flag if multiple scenarios become required for desktop.
64-
UnityEngine.Debug.Log("====== Making a TestLabManager with logPath: " + logPath);
6563
return new DesktopTestLabManager(1, File.AppendText(logPath));
6664
}
6765

0 commit comments

Comments
 (0)