From c67043f1ed3eed5d368f583dac71b8a57fc4abc2 Mon Sep 17 00:00:00 2001
From: An Ko <an@cyan.io>
Date: Mon, 3 Nov 2014 15:52:34 +0100
Subject: [PATCH] Receive xrandr & dpms exts correctly in tests

This makes tests pass that were failing with null reference errors.

`XClient.require` was passing the callback function to `requireExt`,
which called it with parameters `null, ext` on success. The callback
itself seemed to assume it will get only one parameter, which is either
the extension on an error, hence why it tried to call methods on a
`null`.
---
 test-runner.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-runner.js b/test-runner.js
index 13ce5f0..a94b50f 100644
--- a/test-runner.js
+++ b/test-runner.js
@@ -15,8 +15,8 @@ var mocha = new Mocha({
 // 2 - dpms version is 1.1.
 // 3 - to be dpms capable.
 var run_dpms_test = function(X, cb) {
-    X.require('dpms', function(ext) {
-        if (!util.isError(ext)) {
+    X.require('dpms', function(err, ext) {
+        if (!util.isError(err)) {
             dpms = ext;
             dpms.GetVersion(undefined, undefined, function(err, version) {
                 if (!err && version[0] === 1 && version[1] === 1) {
@@ -42,8 +42,8 @@ var run_xtest_test = function(X, cb) {
 };
 
 var run_randr_test = function(X, cb) {
-    X.require('randr', function(ext) {
-        if (!util.isError(ext)) {
+    X.require('randr', function(err, ext) {
+        if (!util.isError(err)) {
             randr = ext;
             randr.QueryVersion(1, 2, function(err, version) {
                 if (err) {