Skip to content

Commit

Permalink
update php 7.4, phpunit 9, separate first test class to Parallel name…
Browse files Browse the repository at this point in the history 
…space
  • Loading branch information
@zajca
zajca committed Jul 17, 2020
1 parent 5d888da commit 634296e
Show file tree
Hide file tree
Showing 65 changed files with 601 additions and 560 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:7.1
FROM php:7.4
MAINTAINER Martin Halamicek <[email protected]>
ENV DEBIAN_FRONTEND noninteractive
ARG COMPOSER_FLAGS="--prefer-dist --no-interaction"
Expand Down Expand Up @@ -72,7 +72,7 @@ RUN mkdir -p ~/.gnupg \

#Synapse ODBC
RUN set -ex; \
pecl install sqlsrv-5.6.1 pdo_sqlsrv-5.6.1; \
pecl install sqlsrv-5.8.1 pdo_sqlsrv-5.8.1; \
docker-php-ext-enable sqlsrv pdo_sqlsrv; \
docker-php-source delete

Expand Down
4 changes: 3 additions & 1 deletion composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@
"microsoft/azure-storage-blob": "^1.4"
},
"require-dev": {
"phpunit/phpunit": "7",
"phpunit/phpunit": "^9",
"brianium/paratest" :"4.*",
"facile-it/paraunit": "1.*",
"squizlabs/php_codesniffer": "^3",
"apigen/apigen": "4.0.0-RC4",
"keboola/php-csv-db-import": "^2.2",
Expand Down
186 changes: 99 additions & 87 deletions phpunit.xml.dist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,103 +9,115 @@
stopOnFailure="false"
stopOnError="false"
syntaxCheck="false"
verbose="true"
verbose="true"
bootstrap="tests/bootstrap.php">

<testsuite name="common">
<directory>tests/Common</directory>
<directory>tests/Options</directory>
<directory>tests/S3Uploader</directory>
<directory>tests/Downloader</directory>
<file>tests/File/CommonFileTests.php</file>
<file>tests/File/AwsFileTest.php</file>
</testsuite>
<php>
<env name="STORAGE_API_URL"/>
<env name="STORAGE_API_TOKEN_REDSHIFT"/>
<env name="STORAGE_API_MAINTENANCE_URL"/>
<env name="STORAGE_API_LINKING_TOKEN"/>
<env name="STORAGE_API_TOKEN_ADMIN_2_IN_SAME_ORGANIZATION"/>
<env name="STORAGE_API_TOKEN_ADMIN_3_IN_OTHER_ORGANIZATION"/>
<env name="STORAGE_API_TOKEN"/>
</php>
<testsuites>
<testsuite name="common">
<directory>tests/Common</directory>
<directory>tests/Options</directory>
<directory>tests/S3Uploader</directory>
<directory>tests/Downloader</directory>
<file>tests/File/CommonFileTests.php</file>
<file>tests/File/AwsFileTest.php</file>
</testsuite>

<testsuite name="file-storage-azure">
<file>tests/File/AzureFileTest.php</file>
<file>tests/File/CommonFileTest.php</file>
</testsuite>
<testsuite name="file-storage-azure">
<file>tests/File/AzureFileTest.php</file>
<file>tests/File/CommonFileTest.php</file>
</testsuite>

<testsuite name="backend-snowflake-abs-part-1">
<file>tests/Backend/Workspaces/MetadataFromSnowflakeWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesSnowflakeTest.php</file>
</testsuite>
<testsuite name="backend-snowflake-abs-part-1">
<file>tests/Backend/Workspaces/MetadataFromSnowflakeWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesSnowflakeTest.php</file>
</testsuite>

<testsuite name="backend-snowflake-abs-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesSnowflakeTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Snowflake</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>
<testsuite name="backend-snowflake-abs-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesSnowflakeTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Snowflake</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>

<testsuite name="backend-redshift-part-1">
<file>tests/Backend/Workspaces/MetadataFromRedshiftWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesRedshiftTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
</testsuite>
<testsuite name="backend-redshift-part-1">
<file>tests/Backend/Workspaces/MetadataFromRedshiftWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesRedshiftTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
</testsuite>

<testsuite name="backend-redshift-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesRedshiftTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Redshift</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>
<testsuite name="backend-redshift-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesRedshiftTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Redshift</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>

<testsuite name="backend-snowflake-part-1">
<file>tests/Backend/Workspaces/MetadataFromSnowflakeWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesSnowflakeTest.php</file>
</testsuite>
<testsuite name="backend-snowflake-part-1">
<file>tests/Backend/CommonPart1/BucketsTest.php</file>
<file>tests/Backend/Workspaces/MetadataFromSnowflakeWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesSnowflakeTest.php</file>
</testsuite>

<testsuite name="backend-snowflake-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesSnowflakeTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Snowflake</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>
<testsuite name="backend-snowflake-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesSnowflakeTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Snowflake</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>

<testsuite name="backend-mixed">
<directory>tests/Backend/Mixed</directory>
<exclude>tests/Backend/Mixed/Workspaces/S3WorkspacesTest.php</exclude>
</testsuite>
<testsuite name="backend-mixed">
<directory>tests/Backend/Mixed</directory>
<exclude>tests/Backend/Mixed/Workspaces/S3WorkspacesTest.php</exclude>
</testsuite>

<testsuite name="backend-synapse-part-1">
<file>tests/Backend/Workspaces/MetadataFromSynapseWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<!-- DataPreviewLimitsTest is in tests/Backend/Synapse -->
<exclude>tests/Backend/CommonPart1/DataPreviewLimitsTest.php</exclude>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesSynapseTest.php</file>
</testsuite>
<testsuite name="backend-synapse-part-1">
<file>tests/Backend/Workspaces/MetadataFromSynapseWorkspaceTest.php</file>
<directory>tests/Backend/CommonPart1</directory>
<!-- DataPreviewLimitsTest is in tests/Backend/Synapse -->
<exclude>tests/Backend/CommonPart1/DataPreviewLimitsTest.php</exclude>
<file>tests/Backend/Workspaces/ComponentsWorkspacesTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/LegacyWorkspacesSynapseTest.php</file>
</testsuite>

<testsuite name="backend-synapse-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesSynapseTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/SynapseWorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Synapse</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>
<testsuite name="backend-synapse-part-2">
<directory>tests/Backend/CommonPart2</directory>
<file>tests/Backend/Workspaces/WorkspacesSynapseTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesTest.php</file>
<file>tests/Backend/Workspaces/SynapseWorkspacesUnloadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesLoadTest.php</file>
<file>tests/Backend/Workspaces/WorkspacesRenameLoadTest.php</file>
<directory>tests/Backend/Synapse</directory>
<file>tests/Backend/Export/ExportParamsTest.php</file>
</testsuite>
</testsuites>
</phpunit>
2 changes: 1 addition & 1 deletion tests/Backend/CommonPart1/AlterTableTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
class AlterTableTest extends StorageApiTestCase
{

public function setUp()
public function setUp(): void
{
parent::setUp();
$this->_initEmptyTestBuckets();
Expand Down
Loading

0 comments on commit 634296e

Please sign in to comment.