Always run tests in a virtual server

2 files changed, 5 insertions, 7 deletions

diff --git a/commands/run-tests b/commands/run-tests
index a000f3b..ace868f 100755
--- a/commands/run-tests
+++ b/commands/run-tests
@@ -17,10 +17,8 @@ def _run_ui_tests():
     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.base_dir, "tests", "sugar", "shell.py")
-
-    result = run.run_test("sugar-runner", test_path, virtual)
+    result = run.run_test("sugar-runner", test_path)
 
     logs_path = os.path.join(profile_path, "logs")
     run.collect_logs(logs_path)
diff --git a/devbot/run.py b/devbot/run.py
index 038775b..3bb1920 100644
--- a/devbot/run.py
+++ b/devbot/run.py
@@ -35,15 +35,15 @@ def run(command):
     os.execlp(args[0], *args)
 
 
-def run_test(command, test_path, virtual=False):
+def run_test(command, test_path):
     environ.setup()
 
     temp_dir = tempfile.mkdtemp("sugar-build-test")
     display_path = os.path.join(temp_dir, "display")
 
-    args = [command, "--display-path", display_path]
-    if virtual:
-        args.append("--virtual")
+    args = [command,
+            "--display-path", display_path,
+            "--virtual"]
 
     command_process = subprocess.Popen(args, stdout=subprocess.PIPE)