Skynet/misc_pterodactyl-panel
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

attempt to fix lock error on mariadb:10.6 tests

Browse source
This commit is contained in:
Matthew Penner 2021-07-11 14:56:27 -06:00
parent 63a466c79a
commit 8d5dbbb57b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
database/Factories/AllocationFactory.php
View file

@ -21,7 +21,7 @@ class AllocationFactory extends Factory
{ {
return [ return [
'ip' => $this->faker->unique()->ipv4, 'ip' => $this->faker->unique()->ipv4,
'port' => $this->faker->unique()->randomNumber(5), 'port' => $this->faker->unique()->numberBetween(1024, 65535),
]; ];
} }
} }

2
tests/Integration/Api/Application/ApplicationApiIntegrationTestCase.php
View file

@ -7,7 +7,6 @@ use PHPUnit\Framework\Assert;
use Pterodactyl\Models\ApiKey; use Pterodactyl\Models\ApiKey;
use Pterodactyl\Services\Acl\Api\AdminAcl; use Pterodactyl\Services\Acl\Api\AdminAcl;
use Pterodactyl\Tests\Integration\IntegrationTestCase; use Pterodactyl\Tests\Integration\IntegrationTestCase;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Pterodactyl\Tests\Traits\Integration\CreatesTestModels; use Pterodactyl\Tests\Traits\Integration\CreatesTestModels;
use Pterodactyl\Transformers\Api\Application\BaseTransformer; use Pterodactyl\Transformers\Api\Application\BaseTransformer;
use Pterodactyl\Transformers\Api\Client\BaseClientTransformer; use Pterodactyl\Transformers\Api\Client\BaseClientTransformer;
@ -16,7 +15,6 @@ use Pterodactyl\Tests\Traits\Http\IntegrationJsonRequestAssertions;
abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase abstract class ApplicationApiIntegrationTestCase extends IntegrationTestCase
{ {
use CreatesTestModels; use CreatesTestModels;
use DatabaseTransactions;
use IntegrationJsonRequestAssertions; use IntegrationJsonRequestAssertions;
/** /**

2
tests/Integration/IntegrationTestCase.php
View file

@ -5,12 +5,14 @@ namespace Pterodactyl\Tests\Integration;
use Carbon\CarbonImmutable; use Carbon\CarbonImmutable;
use Pterodactyl\Tests\TestCase; use Pterodactyl\Tests\TestCase;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Pterodactyl\Tests\Traits\Integration\CreatesTestModels; use Pterodactyl\Tests\Traits\Integration\CreatesTestModels;
use Pterodactyl\Transformers\Api\Application\BaseTransformer; use Pterodactyl\Transformers\Api\Application\BaseTransformer;
abstract class IntegrationTestCase extends TestCase abstract class IntegrationTestCase extends TestCase
{ {
use CreatesTestModels; use CreatesTestModels;
use DatabaseTransactions;
/** /**
* Setup base integration test cases. * Setup base integration test cases.