[gnome-continuous] testbase: Properly set the GDM session
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous] testbase: Properly set the GDM session
- Date: Mon, 28 Apr 2014 15:28:14 +0000 (UTC)
commit 9a62e8d8c7e3e870ffc76f75e78f3bbb5cf6a4b8
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Fri Apr 25 19:01:52 2014 -0400
testbase: Properly set the GDM session
We were setting GdmSession on the Task, but not on the TestOneDisk,
where we actually read it. Pass it through.
src/js/tasks/testbase.js | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/src/js/tasks/testbase.js b/src/js/tasks/testbase.js
index 8dbfa35..89274ec 100644
--- a/src/js/tasks/testbase.js
+++ b/src/js/tasks/testbase.js
@@ -73,11 +73,12 @@ const CommandSocketProxy = new Lang.Class({
const TestOneDisk = new Lang.Class({
Name: 'TestOneDisk',
- _init: function(parentTask, testRequiredMessageIds, testFailedMessageIds, testStatusMessageId) {
+ _init: function(parentTask, testRequiredMessageIds, testFailedMessageIds, testStatusMessageId,
testGdmSession) {
this._parentTask = parentTask;
this._testRequiredMessageIds = testRequiredMessageIds;
this._testFailedMessageIds = testFailedMessageIds;
this._statusMessageId = testStatusMessageId;
+ this._gdmSession = testGdmSession;
},
_fail: function(message) {
@@ -453,8 +454,8 @@ const TestOneDisk = new Lang.Class({
LibQA.injectTestUserCreation(currentDir, currentEtcDir, username, {}, cancellable);
LibQA.enableAutologin(currentDir, currentEtcDir, username, cancellable);
- if (this.GdmSession)
- LibQA.setAutologinSession(currentDir, username, this.GdmSession, cancellable);
+ if (this._gdmSession)
+ LibQA.setAutologinSession(currentDir, username, this._gdmSession, cancellable);
this._parentTask._prepareDisk(mntdir, this._diskArch, cancellable);
} finally {
@@ -628,7 +629,8 @@ const TestBase = new Lang.Class({
let test = new TestOneDisk(this,
this.BaseRequiredMessageIDs.concat(this.RequiredMessageIDs),
this.BaseFailedMessageIDs.concat(this.FailedMessageIDs),
- this.StatusMessageID);
+ this.StatusMessageID,
+ this.GdmSession);
test.execute(this.subworkdir, this._buildData, this.repo, currentImages.get_child(name),
cancellable);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]