From d77d05e620546c24de027ad88fb17999c2596e5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20=C5=A0tancl?= <samuel.stancl@gmail.com>
Date: Sat, 10 Aug 2019 10:59:23 +0200
Subject: [PATCH] Use env vars instead of a python script for ./test

---
 test               | 33 ++++++++-------------------------
 tests/TestCase.php | 18 ++----------------
 2 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/test b/test
index 0d11eef3..5516ec57 100755
--- a/test
+++ b/test
@@ -1,26 +1,9 @@
-#!/usr/bin/env python3
-from os import system
-import argparse
+#!/bin/bash
 
-system('docker-compose up -d')
-
-parser = argparse.ArgumentParser()
-parser.add_argument("--variants", default='1,2',
-                    help="Comma-separated values. Which test variants should be run.")
-args, other = parser.parse_known_args()
-
-variants = args.variants.split(',')
-
-for variant in variants:
-    filename_base = "phpunit_var_" + variant
-    with open('phpunit.xml', 'r') as inp, open(filename_base + '.xml', 'w') as out:
-        out.write(inp.read().replace('"STANCL_TENANCY_TEST_VARIANT" value="1"',
-                                 '"STANCL_TENANCY_TEST_VARIANT" value="%s"' % variant))
-
-    print("Test variant: %s\n" % variant)
-
-    system('docker-compose exec test vendor/bin/phpunit --configuration "%s" --coverage-php %s %s'
-           %  (filename_base + '.xml', 'coverage/' + filename_base + '.cov', ' '.join(other)))
-
-# todo delete folder contents first?
-system("docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/")
+# for development
+docker-compose up -d
+printf "Variant 1\n\n"
+TENANCY_TEST_REDIS_TENANCY=1 TENANCY_TEST_REDIS_CLIENT=phpredis docker-compose exec test vendor/bin/phpunit --coverage-php coverage/1.cov "$@"
+printf "Variant 2\n\n"
+TENANCY_TEST_REDIS_TENANCY=0 TENANCY_TEST_REDIS_CLIENT=predis docker-compose exec test vendor/bin/phpunit --coverage-php coverage/2.cov "$@"
+docker-compose exec test vendor/bin/phpcov merge --clover clover.xml coverage/
\ No newline at end of file
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 3bc0889f..b5d28acd 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -60,7 +60,6 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
         }
 
         $app['config']->set([
-            'database.redis.client' => 'phpredis',
             'database.redis.cache.host' => env('TENANCY_TEST_REDIS_HOST', '127.0.0.1'),
             'database.redis.default.host' => env('TENANCY_TEST_REDIS_HOST', '127.0.0.1'),
             'database.redis.options.prefix' => 'foo',
@@ -86,24 +85,11 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
                 'public',
                 's3',
             ],
-            'tenancy.redis.tenancy' => true,
+            'tenancy.redis.tenancy' => env('TENANCY_TEST_REDIS_TENANCY', true),
+            'database.redis.client' => env('TENANCY_TEST_REDIS_CLIENT', 'phpredis'),
             'tenancy.redis.prefixed_connections' => ['default'],
             'tenancy.migrations_directory' => database_path('../migrations'),
         ]);
-
-        switch ((string) env('STANCL_TENANCY_TEST_VARIANT', '1')) {
-            case '2':
-                $app['config']->set([
-                    'tenancy.redis.tenancy' => false,
-                    'database.redis.client' => 'predis',
-                ]);
-                break;
-            default:
-                $app['config']->set([
-                    'tenancy.redis.tenancy' => true,
-                    'database.redis.client' => 'phpredis',
-                ]);
-        }
     }
 
     protected function getPackageProviders($app)