dan/node-x11
1
0
Fork 0
mirror of https://github.com/danbulant/node-x11 synced 2026-05-27 14:01:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #72 from anko/fix-ext-tests

Browse source 
Fix null-reference errors from extension-tests
This commit is contained in:
Andrey Sidorov 2014-11-04 08:30:57 +11:00
commit 5abfc86d1c
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
test-runner.js
View file

@ -2,7 +2,6 @@ var x11 = require('./lib');
var Mocha = require('mocha'); var Mocha = require('mocha');
var fs = require('fs'); var fs = require('fs');
var path = require('path'); var path = require('path');
var util = require('util');
var async = require('async'); var async = require('async');
var mocha = new Mocha({ var mocha = new Mocha({
@ -15,9 +14,9 @@ var mocha = new Mocha({
// 2 - dpms version is 1.1. // 2 - dpms version is 1.1.
// 3 - to be dpms capable. // 3 - to be dpms capable.
var run_dpms_test = function(X, cb) { var run_dpms_test = function(X, cb) {
X.require('dpms', function(ext) { X.require('dpms', function(err, ext) {
if (!util.isError(ext)) { if (!err) {
dpms = ext; var dpms = ext;
dpms.GetVersion(undefined, undefined, function(err, version) { dpms.GetVersion(undefined, undefined, function(err, version) {
if (!err && version[0] === 1 && version[1] === 1) { if (!err && version[0] === 1 && version[1] === 1) {
dpms.Capable(function(err, capable) { dpms.Capable(function(err, capable) {
@ -35,16 +34,16 @@ var run_dpms_test = function(X, cb) {
}; };
var run_xtest_test = function(X, cb) { var run_xtest_test = function(X, cb) {
X.require('xtest', function(ext) { X.require('xtest', function(err) {
if (!util.isError(ext)) cb(true); if (!err) cb(true);
else cb(false); else cb(false);
}); });
}; };
var run_randr_test = function(X, cb) { var run_randr_test = function(X, cb) {
X.require('randr', function(ext) { X.require('randr', function(err, ext) {
if (!util.isError(ext)) { if (!err) {
randr = ext; var randr = ext;
randr.QueryVersion(1, 2, function(err, version) { randr.QueryVersion(1, 2, function(err, version) {
if (err) { if (err) {
cb(false); cb(false);