Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@maskarb
maskarb committed Aug 30, 2023
1 parent bb65464 commit 5f39ae1
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 38 deletions.
2 changes: 1 addition & 1 deletion nise/__main__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def valid_currency(currency):

def today():
"""Create the date of today."""
return datetime.datetime.now().replace(microsecond=0, second=0, minute=0)
return datetime.datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=0)


def add_aws_parser_args(parser):
Expand Down
130 changes: 93 additions & 37 deletions tests/test_main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from datetime import date
from datetime import datetime
from datetime import timedelta
from datetime import timezone
from unittest import TestCase
from unittest.mock import patch

Expand Down Expand Up @@ -367,11 +368,12 @@ def test_load_static_report_data_azure_dates(self):
_load_static_report_data(options)
gen_values = dict(*options.get("static_report_data").get("generators")[0].values())
self.assertEqual(
gen_values.get("start_date"), str(datetime.now().replace(microsecond=0, second=0, minute=0, hour=0))
gen_values.get("start_date"),
str(datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=0, hour=0)),
)
self.assertEqual(
gen_values.get("end_date"),
str(datetime.now().replace(microsecond=0, second=0, minute=0) + timedelta(hours=24)),
str(datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=0) + timedelta(hours=24)),
)

def test_invalid_gcp_inputs(self):
Expand Down Expand Up @@ -557,14 +559,26 @@ def test_aws_dates(self, mock_load):
]
static_report_data = {"generators": aws_gens}
expected = {
"aws_gen_first": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
"aws_gen_first_second": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 2, 0, 0)},
"aws_gen_first": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"aws_gen_first_second": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 2, 0, 0, tzinfo=timezone.utc),
},
"aws_gen_first_start": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime.now().replace(minute=0, second=0, microsecond=0),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime.now(tz=timezone.utc).replace(minute=0, second=0, microsecond=0),
},
"aws_gen_last": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
},
"aws_gen_last_first": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"aws_gen_last": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 5, 31, 0, 0)},
"aws_gen_last_first": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
}
options = {"provider": "aws", "static_report_file": "tests/aws_static_report.yml"}
mock_load.return_value = static_report_data
Expand Down Expand Up @@ -602,19 +616,25 @@ def test_aws_market_dates(self, mock_load):
]
static_report_data = {"generators": aws_mp_gens}
expected = {
"aws_mp_gen_first": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
"aws_mp_gen_first": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"aws_mp_gen_first_second": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime(2020, 6, 2, 0, 0),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 2, 0, 0, tzinfo=timezone.utc),
},
"aws_mp_gen_first_start": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime.now().replace(minute=0, second=0, microsecond=0),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime.now(tz=timezone.utc).replace(minute=0, second=0, microsecond=0),
},
"aws_mp_gen_last": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
},
"aws_mp_gen_last": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 5, 31, 0, 0)},
"aws_mp_gen_last_first": {
"start_date": datetime(2020, 5, 31, 0, 0),
"end_date": datetime(2020, 6, 1, 0, 0),
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
}
options = {"provider": "aws-marketplace", "static_report_file": "tests/aws_static_report.yml"}
Expand All @@ -630,7 +650,7 @@ def test_aws_market_dates(self, mock_load):
def test_ocp_dates(self, mock_load):
"""Test that select static-data-file dates return correct dates."""
ocp_gens = [
{"ocp_gen_first": {"start_date": datetime(2020, 6, 1).date(), "end_date": datetime(2020, 6, 1).date()}},
{"ocp_gen_first": {"start_date": "2020-06-01", "end_date": datetime(2020, 6, 1).date()}},
{
"ocp_gen_first_second": {
"start_date": datetime(2020, 6, 1).date(),
Expand All @@ -645,17 +665,34 @@ def test_ocp_dates(self, mock_load):
"end_date": datetime(2020, 6, 1).date(),
}
},
{"ocp_gen_times": {"start_date": "2023-08-01T05", "end_date": "2023-08-02T23:45"}},
]
static_report_data = {"generators": ocp_gens}
expected = {
"ocp_gen_first": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
"ocp_gen_first_second": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 2, 0, 0)},
"ocp_gen_first": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"ocp_gen_first_second": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 2, 0, 0, tzinfo=timezone.utc),
},
"ocp_gen_first_start": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime.now().replace(minute=0, second=0, microsecond=0),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime.now(tz=timezone.utc).replace(minute=0, second=0, microsecond=0),
},
"ocp_gen_last": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
},
"ocp_gen_last_first": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"ocp_gen_times": {
"start_date": datetime(2023, 8, 1, 5, 0, tzinfo=timezone.utc),
"end_date": datetime(2023, 8, 2, 23, 45, tzinfo=timezone.utc),
},
"ocp_gen_last": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 5, 31, 0, 0)},
"ocp_gen_last_first": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
}
options = {"provider": "ocp", "static_report_file": "tests/ocp_static_report.yml"}
mock_load.return_value = static_report_data
Expand Down Expand Up @@ -688,19 +725,26 @@ def test_azure_dates(self, mock_load):
]
static_report_data = {"generators": azure_gens}
expected = {
"azure_gen_first": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 2, 0, 0)},
"azure_gen_first": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 2, 0, 0, tzinfo=timezone.utc),
},
"azure_gen_first_second": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime(2020, 6, 3, 0, 0),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 3, 0, 0, tzinfo=timezone.utc),
},
"azure_gen_first_start": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime.now().replace(microsecond=0, second=0, minute=0) + timedelta(hours=24),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime.now(tz=timezone.utc).replace(microsecond=0, second=0, minute=0)
+ timedelta(hours=24),
},
"azure_gen_last": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"azure_gen_last": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
"azure_gen_last_first": {
"start_date": datetime(2020, 5, 31, 0, 0),
"end_date": datetime(2020, 6, 2, 0, 0),
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 2, 0, 0, tzinfo=timezone.utc),
},
}
options = {"provider": "azure", "static_report_file": "tests/azure_static_report.yml"}
Expand Down Expand Up @@ -734,14 +778,26 @@ def test_oci_dates(self, mock_load):
]
static_report_data = {"generators": oci_gens}
expected = {
"oci_gen_first": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
"oci_gen_first_second": {"start_date": datetime(2020, 6, 1, 0, 0), "end_date": datetime(2020, 6, 2, 0, 0)},
"oci_gen_first": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"oci_gen_first_second": {
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 2, 0, 0, tzinfo=timezone.utc),
},
"oci_gen_first_start": {
"start_date": datetime(2020, 6, 1, 0, 0),
"end_date": datetime.now().replace(minute=0, second=0, microsecond=0),
"start_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
"end_date": datetime.now(tz=timezone.utc).replace(minute=0, second=0, microsecond=0),
},
"oci_gen_last": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
},
"oci_gen_last_first": {
"start_date": datetime(2020, 5, 31, 0, 0, tzinfo=timezone.utc),
"end_date": datetime(2020, 6, 1, 0, 0, tzinfo=timezone.utc),
},
"oci_gen_last": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 5, 31, 0, 0)},
"oci_gen_last_first": {"start_date": datetime(2020, 5, 31, 0, 0), "end_date": datetime(2020, 6, 1, 0, 0)},
}
options = {"provider": "oci", "static_report_file": "tests/oci_static_report.yml"}
mock_load.return_value = static_report_data
Expand Down

0 comments on commit 5f39ae1

Please sign in to comment.