From f6272b100f64bc851b55ddc6676953a0b9ef941b Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Sat, 11 May 2019 10:13:03 -0500 Subject: [PATCH] Fixed tests so they work in new packaging setup --- GeoffreyApp/test/test_commands.py | 9 +++++---- GeoffreyApp/test/test_key.py | 2 +- GeoffreyApp/test/test_mcm_api.py | 2 +- GeoffreyApp/test/test_minecraft_api.py | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/GeoffreyApp/test/test_commands.py b/GeoffreyApp/test/test_commands.py index ed1831c..bb0514b 100644 --- a/GeoffreyApp/test/test_commands.py +++ b/GeoffreyApp/test/test_commands.py @@ -1,5 +1,6 @@ from django.test import TestCase -from GeoffreyApp.GeoffreyApp.models import * +from GeoffreyApp.models import * +from GeoffreyApp.api.commands import * from time import sleep # Create your tests here. @@ -42,13 +43,13 @@ class CommandsAPITestCase(TestCase): self.farm.owner.add(self.player) def test_register(self): - register(player_name="DrVakky", discord_uuid="229423434256351233") + register(player_name="Notch", discord_uuid="229423434256351233") - count = Player.objects.filter(mc_uuid__iexact="7afbf6632bf049ef915f22e81b298d17").count() + count = Player.objects.filter(mc_uuid__iexact="069a79f444e94726a5befca90e38aaf5").count() self.assertEqual(count, 1) - self.assertRaises(PlayerInDBError, register, player_name="DrVakky", discord_uuid="229423434256351233") + self.assertRaises(PlayerInDBError, register, player_name="Notch", discord_uuid="229423434256351233") def test_add_base(self): add_base(x_pos=0, z_pos=0, name=None, discord_uuid=DISCORD_UUID) diff --git a/GeoffreyApp/test/test_key.py b/GeoffreyApp/test/test_key.py index dfcf376..580e454 100644 --- a/GeoffreyApp/test/test_key.py +++ b/GeoffreyApp/test/test_key.py @@ -1,5 +1,5 @@ from django.test import TestCase -from GeoffreyApp.GeoffreyApp.util import create_token +from GeoffreyApp.util import create_token class TokenAPITestCase(TestCase): diff --git a/GeoffreyApp/test/test_mcm_api.py b/GeoffreyApp/test/test_mcm_api.py index 3d2d7fa..7c74332 100644 --- a/GeoffreyApp/test/test_mcm_api.py +++ b/GeoffreyApp/test/test_mcm_api.py @@ -1,5 +1,5 @@ from django.test import TestCase -from GeoffreyApp.GeoffreyApp.mcm_api import get_player +from GeoffreyApp.mcm_api import get_player # Create your tests here. UUID = "fe7e84132570458892032b69ff188bc3" diff --git a/GeoffreyApp/test/test_minecraft_api.py b/GeoffreyApp/test/test_minecraft_api.py index fef59a9..635be1e 100644 --- a/GeoffreyApp/test/test_minecraft_api.py +++ b/GeoffreyApp/test/test_minecraft_api.py @@ -1,5 +1,5 @@ from django.test import TestCase -from GeoffreyApp.GeoffreyApp.minecraft_api import grab_playername, grab_UUID +from GeoffreyApp.minecraft_api import grab_playername, grab_UUID # Create your tests here. UUID = "fe7e84132570458892032b69ff188bc3"