ran unittest2pytest
This commit is contained in:
		| @@ -28,7 +28,7 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         log.date = d1 | ||||
|         log.save() | ||||
|         log.reload() | ||||
|         self.assertEqual(log.date, d1) | ||||
|         assert log.date == d1 | ||||
|  | ||||
|         # Post UTC - microseconds are rounded (down) nearest millisecond - with | ||||
|         # default datetimefields | ||||
| @@ -36,7 +36,7 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         log.date = d1 | ||||
|         log.save() | ||||
|         log.reload() | ||||
|         self.assertEqual(log.date, d1) | ||||
|         assert log.date == d1 | ||||
|  | ||||
|         # Pre UTC dates microseconds below 1000 are dropped - with default | ||||
|         # datetimefields | ||||
| @@ -44,7 +44,7 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         log.date = d1 | ||||
|         log.save() | ||||
|         log.reload() | ||||
|         self.assertEqual(log.date, d1) | ||||
|         assert log.date == d1 | ||||
|  | ||||
|         # Pre UTC microseconds above 1000 is wonky - with default datetimefields | ||||
|         # log.date has an invalid microsecond value so I can't construct | ||||
| @@ -54,9 +54,9 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|             log.date = d1 | ||||
|             log.save() | ||||
|             log.reload() | ||||
|             self.assertEqual(log.date, d1) | ||||
|             assert log.date == d1 | ||||
|             log1 = LogEntry.objects.get(date=d1) | ||||
|             self.assertEqual(log, log1) | ||||
|             assert log == log1 | ||||
|  | ||||
|         # Test string padding | ||||
|         microsecond = map(int, [math.pow(10, x) for x in range(6)]) | ||||
| @@ -64,7 +64,7 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|  | ||||
|         for values in itertools.product([2014], mm, dd, hh, ii, ss, microsecond): | ||||
|             stored = LogEntry(date=datetime.datetime(*values)).to_mongo()["date"] | ||||
|             self.assertTrue( | ||||
|             assert ( | ||||
|                 re.match("^\d{4},\d{2},\d{2},\d{2},\d{2},\d{2},\d{6}$", stored) | ||||
|                 is not None | ||||
|             ) | ||||
| @@ -73,7 +73,7 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         stored = LogEntry(date_with_dots=datetime.datetime(2014, 1, 1)).to_mongo()[ | ||||
|             "date_with_dots" | ||||
|         ] | ||||
|         self.assertTrue( | ||||
|         assert ( | ||||
|             re.match("^\d{4}.\d{2}.\d{2}.\d{2}.\d{2}.\d{2}.\d{6}$", stored) is not None | ||||
|         ) | ||||
|  | ||||
| @@ -93,40 +93,40 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         log.save() | ||||
|  | ||||
|         log1 = LogEntry.objects.get(date=d1) | ||||
|         self.assertEqual(log, log1) | ||||
|         assert log == log1 | ||||
|  | ||||
|         # create extra 59 log entries for a total of 60 | ||||
|         for i in range(1951, 2010): | ||||
|             d = datetime.datetime(i, 1, 1, 0, 0, 1, 999) | ||||
|             LogEntry(date=d).save() | ||||
|  | ||||
|         self.assertEqual(LogEntry.objects.count(), 60) | ||||
|         assert LogEntry.objects.count() == 60 | ||||
|  | ||||
|         # Test ordering | ||||
|         logs = LogEntry.objects.order_by("date") | ||||
|         i = 0 | ||||
|         while i < 59: | ||||
|             self.assertTrue(logs[i].date <= logs[i + 1].date) | ||||
|             assert logs[i].date <= logs[i + 1].date | ||||
|             i += 1 | ||||
|  | ||||
|         logs = LogEntry.objects.order_by("-date") | ||||
|         i = 0 | ||||
|         while i < 59: | ||||
|             self.assertTrue(logs[i].date >= logs[i + 1].date) | ||||
|             assert logs[i].date >= logs[i + 1].date | ||||
|             i += 1 | ||||
|  | ||||
|         # Test searching | ||||
|         logs = LogEntry.objects.filter(date__gte=datetime.datetime(1980, 1, 1)) | ||||
|         self.assertEqual(logs.count(), 30) | ||||
|         assert logs.count() == 30 | ||||
|  | ||||
|         logs = LogEntry.objects.filter(date__lte=datetime.datetime(1980, 1, 1)) | ||||
|         self.assertEqual(logs.count(), 30) | ||||
|         assert logs.count() == 30 | ||||
|  | ||||
|         logs = LogEntry.objects.filter( | ||||
|             date__lte=datetime.datetime(2011, 1, 1), | ||||
|             date__gte=datetime.datetime(2000, 1, 1), | ||||
|         ) | ||||
|         self.assertEqual(logs.count(), 10) | ||||
|         assert logs.count() == 10 | ||||
|  | ||||
|         LogEntry.drop_collection() | ||||
|  | ||||
| @@ -137,17 +137,17 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         logs = list(LogEntry.objects.order_by("date")) | ||||
|         for next_idx, log in enumerate(logs[:-1], start=1): | ||||
|             next_log = logs[next_idx] | ||||
|             self.assertTrue(log.date < next_log.date) | ||||
|             assert log.date < next_log.date | ||||
|  | ||||
|         logs = list(LogEntry.objects.order_by("-date")) | ||||
|         for next_idx, log in enumerate(logs[:-1], start=1): | ||||
|             next_log = logs[next_idx] | ||||
|             self.assertTrue(log.date > next_log.date) | ||||
|             assert log.date > next_log.date | ||||
|  | ||||
|         logs = LogEntry.objects.filter( | ||||
|             date__lte=datetime.datetime(2015, 1, 1, 0, 0, 0, 10000) | ||||
|         ) | ||||
|         self.assertEqual(logs.count(), 4) | ||||
|         assert logs.count() == 4 | ||||
|  | ||||
|     def test_no_default_value(self): | ||||
|         class Log(Document): | ||||
| @@ -156,11 +156,11 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         Log.drop_collection() | ||||
|  | ||||
|         log = Log() | ||||
|         self.assertIsNone(log.timestamp) | ||||
|         assert log.timestamp is None | ||||
|         log.save() | ||||
|  | ||||
|         fetched_log = Log.objects.with_id(log.id) | ||||
|         self.assertIsNone(fetched_log.timestamp) | ||||
|         assert fetched_log.timestamp is None | ||||
|  | ||||
|     def test_default_static_value(self): | ||||
|         NOW = datetime.datetime.utcnow() | ||||
| @@ -171,11 +171,11 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         Log.drop_collection() | ||||
|  | ||||
|         log = Log() | ||||
|         self.assertEqual(log.timestamp, NOW) | ||||
|         assert log.timestamp == NOW | ||||
|         log.save() | ||||
|  | ||||
|         fetched_log = Log.objects.with_id(log.id) | ||||
|         self.assertEqual(fetched_log.timestamp, NOW) | ||||
|         assert fetched_log.timestamp == NOW | ||||
|  | ||||
|     def test_default_callable(self): | ||||
|         NOW = datetime.datetime.utcnow() | ||||
| @@ -186,8 +186,8 @@ class ComplexDateTimeFieldTest(MongoDBTestCase): | ||||
|         Log.drop_collection() | ||||
|  | ||||
|         log = Log() | ||||
|         self.assertGreaterEqual(log.timestamp, NOW) | ||||
|         assert log.timestamp >= NOW | ||||
|         log.save() | ||||
|  | ||||
|         fetched_log = Log.objects.with_id(log.id) | ||||
|         self.assertGreaterEqual(fetched_log.timestamp, NOW) | ||||
|         assert fetched_log.timestamp >= NOW | ||||
|   | ||||
		Reference in New Issue
	
	Block a user