Fix tests

This commit is contained in:
Jan Dittberner 2023-04-29 13:10:25 +02:00
parent 866f6c8083
commit d88745f46b
11 changed files with 35 additions and 116 deletions

View file

@ -94,7 +94,7 @@ class DatabaseUserManagerTest(TestCaseWithCeleryTasks):
self.assertEqual(dbu.name, "{user}db01".format(user=self.osuser.username))
self.assertEqual(dbu.osuser, self.osuser)
self.assertEqual(dbu.db_type, DB_TYPES.mysql)
taskres = TaskResult.objects.all()
taskres = TaskResult.objects.order_by("created").all()
self.assertEqual(len(taskres), 4)
self.assertEqual(taskres[0].creator, "handle_dbuser_created")
self.assertEqual(taskres[0].notes, "mysql user creation")
@ -154,7 +154,7 @@ class DatabaseUserTest(TestCaseWithCeleryTasks):
dbid = db.id
self.dbu.delete()
self.assertFalse(UserDatabase.objects.filter(id=dbid).exists())
taskres = TaskResult.objects.all()
taskres = TaskResult.objects.order_by("created").all()
self.assertEqual(len(taskres), 3)
self.assertEqual(taskres[0].creator, "handle_userdb_created")
self.assertEqual(taskres[0].notes, "pgsql database creation")
@ -187,7 +187,7 @@ class UserDatabaseManagerTest(TestCaseWithCeleryTasks):
self.assertEqual(
db.db_user.name, "{user}db01".format(user=self.osuser.username)
)
taskres = TaskResult.objects.all()
taskres = TaskResult.objects.order_by("created").all()
self.assertEqual(len(taskres), 2)
self.assertEqual(taskres[0].creator, "handle_dbuser_created")
self.assertEqual(taskres[0].notes, "mysql user creation")
@ -202,7 +202,7 @@ class UserDatabaseManagerTest(TestCaseWithCeleryTasks):
self.assertEqual(
db.db_user.name, "{user}db01".format(user=self.osuser.username)
)
taskres = TaskResult.objects.all()
taskres = TaskResult.objects.order_by("created").all()
self.assertEqual(len(taskres), 2)
self.assertEqual(taskres[0].creator, "handle_dbuser_created")
self.assertEqual(taskres[0].notes, "pgsql user creation")
@ -267,20 +267,20 @@ class UserDatabaseTest(TestCaseWithCeleryTasks):
def test___str__(self):
customer = Customer.objects.create_user(username="testcustomer")
osuser = User.objects.create_user(customer=customer)
db = UserDatabase.objects.create_userdatabase_with_user(DB_TYPES.pgsql, osuser)
os_user = User.objects.create_user(customer=customer)
db = UserDatabase.objects.create_userdatabase_with_user(DB_TYPES.pgsql, os_user)
self.assertEqual(
str(db),
"{user}db01 ({dbuser})".format(user=osuser.username, dbuser=db.db_user),
"{user}db01 ({dbuser})".format(user=os_user.username, dbuser=db.db_user),
)
def test_delete_mysql_db(self):
customer = Customer.objects.create_user(username="testcustomer")
osuser = User.objects.create_user(customer=customer)
os_user = User.objects.create_user(customer=customer)
TaskResult.objects.all().delete()
db = UserDatabase.objects.create_userdatabase_with_user(DB_TYPES.mysql, osuser)
db = UserDatabase.objects.create_userdatabase_with_user(DB_TYPES.mysql, os_user)
db.delete()
taskres = TaskResult.objects.all()
self.assertEqual(len(taskres), 3)
self.assertEqual(taskres[2].creator, "handle_userdb_deleted")
self.assertEqual(taskres[2].notes, "mysql database deletion")
task_result = TaskResult.objects.order_by("created").all()
self.assertEqual(len(task_result), 3)
self.assertEqual(task_result[2].creator, "handle_userdb_deleted")
self.assertEqual(task_result[2].notes, "mysql database deletion")