From 5fb65175f5c47740a702ca0b883e397e45428a88 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 12 Apr 2020 14:29:44 +0200 Subject: [PATCH 1/2] Use TESTS= instead of tests= to run subset of tests --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 84c7ad3ab1..b8b4857155 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ BLACK_FORMAT_CONFIGS = --target-version py37 --line-length 100 --exclude=/docs TEST_GAME_DIR = .test_game_dir -tests?=evennia +TESTS ?= evennia default: @echo " Usage: " @@ -29,10 +29,10 @@ test: evennia --init $(TEST_GAME_DIR);\ cd $(TEST_GAME_DIR);\ evennia migrate;\ - evennia test --keepdb $(tests);\ + evennia test --keepdb $(TESTS);\ testp: evennia --init $(TEST_GAME_DIR);\ cd $(TEST_GAME_DIR);\ evennia migrate;\ - evennia test --keepdb --parallel 4 $(tests);\ + evennia test --keepdb --parallel 4 $(TESTS);\ From 56ff8faacbc54253c4b7f710d59a9cbc492b6430 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 12 Apr 2020 18:18:41 +0200 Subject: [PATCH 2/2] Test with travis fix --- evennia/accounts/tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evennia/accounts/tests.py b/evennia/accounts/tests.py index c4b3e80391..2abde675b7 100644 --- a/evennia/accounts/tests.py +++ b/evennia/accounts/tests.py @@ -92,7 +92,8 @@ class TestDefaultGuest(EvenniaTest): @patch("evennia.accounts.accounts.ChannelDB.objects.get_channel") def test_create(self, get_channel): get_channel.connect = MagicMock(return_value=True) - account, errors = DefaultGuest.create() + with override_settings(GUEST_HOME=self.room1.dbref): + account, errors = DefaultGuest.create() self.assertTrue(account, "Guest account should have been created.") self.assertFalse(errors)