Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 15c5582

Browse files
author
Ivan Dudarev
committed
ignoring .gitkeep file in test
1 parent f903e5d commit 15c5582

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

tests/IptoolTest.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public function testCreateDatabase()
2525
$converter->setTime($time);
2626
$converter->setLicense($license);
2727

28-
$converter->addCSV('infoCSV',$csvDir.DIRECTORY_SEPARATOR.'info.csv',2);
28+
$converter->addCSV('infoCSV',$csvDir.DIRECTORY_SEPARATOR.'info.csv',1);
2929
$converter->addCSV('networksCSV',$csvDir.DIRECTORY_SEPARATOR.'networks.csv',1);
3030

3131
$info = array(
@@ -93,7 +93,9 @@ public function testCreateDatabase()
9393
unlink($dbFile);
9494
$tmpFiles = glob($tmpDir.DIRECTORY_SEPARATOR.'*');
9595
foreach ($tmpFiles as $tmpFile) {
96-
unlink($tmpFile);
96+
if ($tmpFile != $tmpDir.DIRECTORY_SEPARATOR.'.gitkeep') {
97+
unlink($tmpFile);
98+
}
9799
}
98100
}
99101
}

tests/csv/info.csv

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
Строка с какой-либо информацией (например, копирайт). Вторая строка описывает колонки и тоже не будет использоваться в БД.
21
id,interval_num,data1,data2
32
2,3,"some info 1","some info 2"
43
17,4,"some info 3","some info 4"
54
89,1,"some info 5","some info 6"
6-
192,2,"some info 7","some info 8"
7-
34,"unused row","some info 9","some info 10"
5+
192,2,"some info 7","some info 8"

0 commit comments

Comments
 (0)