mirror of
				https://github.com/django/django.git
				synced 2025-10-30 17:16:10 +00:00 
			
		
		
		
	[1.11.x] Simplified tests with assertDoesNotOptimize().
Backport of bfd42392ab from master
			
			
This commit is contained in:
		| @@ -211,12 +211,7 @@ class OptimizerTests(SimpleTestCase): | |||||||
|             [], |             [], | ||||||
|         ) |         ) | ||||||
|         # This should not work - FK should block it |         # This should not work - FK should block it | ||||||
|         self.assertOptimizesTo( |         self.assertDoesNotOptimize( | ||||||
|             [ |  | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |  | ||||||
|                 migrations.CreateModel("Bar", [("other", models.ForeignKey("testapp.Foo", models.CASCADE))]), |  | ||||||
|                 migrations.DeleteModel("Foo"), |  | ||||||
|             ], |  | ||||||
|             [ |             [ | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), | ||||||
|                 migrations.CreateModel("Bar", [("other", models.ForeignKey("testapp.Foo", models.CASCADE))]), |                 migrations.CreateModel("Bar", [("other", models.ForeignKey("testapp.Foo", models.CASCADE))]), | ||||||
| @@ -247,12 +242,7 @@ class OptimizerTests(SimpleTestCase): | |||||||
|             app_label="testapp", |             app_label="testapp", | ||||||
|         ) |         ) | ||||||
|         # This should not work - bases should block it |         # This should not work - bases should block it | ||||||
|         self.assertOptimizesTo( |         self.assertDoesNotOptimize( | ||||||
|             [ |  | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |  | ||||||
|                 migrations.CreateModel("Bar", [("size", models.IntegerField())], bases=("testapp.Foo", )), |  | ||||||
|                 migrations.DeleteModel("Foo"), |  | ||||||
|             ], |  | ||||||
|             [ |             [ | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), | ||||||
|                 migrations.CreateModel("Bar", [("size", models.IntegerField())], bases=("testapp.Foo", )), |                 migrations.CreateModel("Bar", [("size", models.IntegerField())], bases=("testapp.Foo", )), | ||||||
| @@ -317,12 +307,7 @@ class OptimizerTests(SimpleTestCase): | |||||||
|         AddField should NOT optimize into CreateModel if it's an FK to a model |         AddField should NOT optimize into CreateModel if it's an FK to a model | ||||||
|         that's between them. |         that's between them. | ||||||
|         """ |         """ | ||||||
|         self.assertOptimizesTo( |         self.assertDoesNotOptimize( | ||||||
|             [ |  | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |  | ||||||
|                 migrations.CreateModel("Link", [("url", models.TextField())]), |  | ||||||
|                 migrations.AddField("Foo", "link", models.ForeignKey("migrations.Link", models.CASCADE)), |  | ||||||
|             ], |  | ||||||
|             [ |             [ | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), | ||||||
|                 migrations.CreateModel("Link", [("url", models.TextField())]), |                 migrations.CreateModel("Link", [("url", models.TextField())]), | ||||||
| @@ -337,14 +322,7 @@ class OptimizerTests(SimpleTestCase): | |||||||
|         """ |         """ | ||||||
|         # Note: The middle model is not actually a valid through model, |         # Note: The middle model is not actually a valid through model, | ||||||
|         # but that doesn't matter, as we never render it. |         # but that doesn't matter, as we never render it. | ||||||
|         self.assertOptimizesTo( |         self.assertDoesNotOptimize( | ||||||
|             [ |  | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |  | ||||||
|                 migrations.CreateModel("LinkThrough", []), |  | ||||||
|                 migrations.AddField( |  | ||||||
|                     "Foo", "link", models.ManyToManyField("migrations.Link", through="migrations.LinkThrough") |  | ||||||
|                 ), |  | ||||||
|             ], |  | ||||||
|             [ |             [ | ||||||
|                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), |                 migrations.CreateModel("Foo", [("name", models.CharField(max_length=255))]), | ||||||
|                 migrations.CreateModel("LinkThrough", []), |                 migrations.CreateModel("LinkThrough", []), | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user