[gnome-continuous] task: first check that relpath is not null



commit e15e6ca94f1fa85d6c98a85524966aa94a1d6199
Author: Vadim Rutkovsky <vrutkovs redhat com>
Date:   Wed May 7 01:13:01 2014 +0200

    task: first check that relpath is not null

 src/js/task.js           |    4 +++-
 src/js/tasks/testbase.js |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/js/task.js b/src/js/task.js
index 2c34e6f..3596f55 100644
--- a/src/js/task.js
+++ b/src/js/task.js
@@ -345,7 +345,9 @@ const Task = new Lang.Class({
         this.builddir = Gio.File.new_for_path(GLib.getenv('_OSTBUILD_BUILDDIR'));
 
        let relpath = this.workdir.get_relative_path(this.builddir);
-       if (relpath == 'local') {
+       if (relpath == null) {
+               throw new Error();
+       } else if (relpath == 'local') {
            this._buildName = 'local';
        } else if (relpath.indexOf('builds/') == 0) {
            relpath = relpath.substring(7);
diff --git a/src/js/tasks/testbase.js b/src/js/tasks/testbase.js
index 3f90992..c86fe2d 100644
--- a/src/js/tasks/testbase.js
+++ b/src/js/tasks/testbase.js
@@ -543,7 +543,7 @@ const TestBase = new Lang.Class({
 
     TestTrees: ['-runtime'],
     CompleteIdleWaitSeconds: 10,
-    Timeout: 5 * 60,
+    Timeout: 60,
 
     BaseRequiredMessageIDs: ["39f53479d3a045ac8e11786248231fbf", // graphical.target 
                              "f77379a8490b408bbe5f6940505a777b",  // systemd-journald


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]