Refactor a bit to keep devbot somewhat generic

2 files changed, 31 insertions, 2 deletions

diff --git a/commands/run b/commands/run
index bef41f2..f3a5f4a 100755
--- a/commands/run
+++ b/commands/run
@@ -1,8 +1,23 @@
 #!/usr/bin/python
 
+import os
+import sys
+
 import common
 
 from devbot import run
+from devbot import config
 
 common.setup()
-run.run_sugar()
+
+profile_env = os.environ.get("SUGAR_PROFILE", None)
+profile_pref = config.get_pref("PROFILE")
+
+if profile_env is not None:
+    if profile_pref is None:
+        config.set_pref("PROFILE", _get_random_id())
+    elif profile_pref == profile_env:
+        print "Cannot run two instances with the same profile."
+        sys.exit(1)
+
+run.run("sugar-runner")
diff --git a/commands/test-ui b/commands/test-ui
index 57a4d35..0570cf5 100755
--- a/commands/test-ui
+++ b/commands/test-ui
@@ -1,6 +1,7 @@
 #!/usr/bin/python
 
 import os
+import shutil
 import sys
 
 import common
@@ -9,7 +10,20 @@ from devbot import run
 
 common.setup()
 
+os.environ["SUGAR_LOGGER_LEVEL"] = "debug"
+os.environ["SUGAR_PROFILE"] = "uitests"
+os.environ["GTK_MODULES"] = "gail:atk-bridge"
+
+profile_path = os.path.expanduser("~/.sugar/uitests")
+shutil.rmtree(profile_path, ignore_errors=True)
+
 virtual = "SUGAR_BUILDBOT" in os.environ
 test_path = os.path.join(common.tests_dir, "sugar", "shell.py")
-if not run.run_test(test_path, virtual):
+
+result = run.run_test("sugar-runner", test_path, virtual)
+
+logs_path = os.path.join(profile_path, "logs")
+run.merge_logs(logs_path, "test.log")
+
+if not result:
     sys.exit(1)