Skip to content
This repository was archived by the owner on Sep 10, 2021. It is now read-only.

Commit ef7a5f4

Browse files
Michael GraueryuzhengZ
authored andcommitted
BUG: Refs #212. Removed commented out code and obsolete comment.
1 parent 136068e commit ef7a5f4

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

modules/batchmake/tests/controllers/BatchmakeControllerTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public function setupAndGetConfig()
4949
MIDAS_BATCHMAKE_SCRIPT_DIR_PROPERTY => $tmpDir.'/batchmake/tests/script',
5050
MIDAS_BATCHMAKE_APP_DIR_PROPERTY => $tmpDir.'/batchmake/tests/bin',
5151
MIDAS_BATCHMAKE_DATA_DIR_PROPERTY => $tmpDir.'/batchmake/tests/data',
52-
MIDAS_BATCHMAKE_CONDOR_BIN_DIR_PROPERTY => $tmpDir.'/batchmake/tests/condorbin');//change this with mocks??
52+
MIDAS_BATCHMAKE_CONDOR_BIN_DIR_PROPERTY => $tmpDir.'/batchmake/tests/condorbin');
5353
// now make sure these dirs exist
5454
// later can actually add some stuff to these dirs
5555
foreach($configProps as $prop => $dir)

modules/batchmake/tests/controllers/components/KWBatchmakeComponentTest.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public function setUp()
3737
require_once BASE_PATH.'/modules/batchmake/tests/library/ExecutorMock.php';
3838
$executor = new Batchmake_ExecutorMock();
3939
$this->kwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($this->setupAndGetConfig(), $executor);
40-
// $this->kwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($this->setupAndGetConfig());
4140
}
4241
}
4342

@@ -53,8 +52,8 @@ public function testIsConfigCorrect()
5352
// now make a change to something that shouldn't work
5453
$badConfigVals = $this->setupAndGetConfig();
5554
$badConfigVals[MIDAS_BATCHMAKE_DATA_DIR_PROPERTY] = '/unlikely/to/work/right';
56-
$badKwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($badConfigVals);//BASE_PATH.'/modules/batchmake/tests/configs/module.local.ini');
57-
$this->assertFalse($badKwBatchmakeComponent->isConfigCorrect());//$badConfigVals));
55+
$badKwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($badConfigVals);
56+
$this->assertFalse($badKwBatchmakeComponent->isConfigCorrect());
5857
}
5958

6059
/**

0 commit comments

Comments
 (0)