-
Notifications
You must be signed in to change notification settings - Fork 19
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert relevant tests back to normal
- Loading branch information
1 parent
431b0e8
commit d2d787c
Showing
1 changed file
with
12 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,8 +71,8 @@ def test_generate_federal_report(self): | |
| fake_open = mock_open() | ||
| expected_file_content = [ | ||
| call("Domain name,Domain type,Agency,Organization name,City,State,Security contact email\r\n"), | ||
| call("cdomain1.gov,Federal - Executive,Portfolio 1 Federal Agency,,,,(blank)\r\n"), | ||
| call("cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), | ||
| call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), | ||
| call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), | ||
| call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), | ||
| ] | ||
|
|
@@ -93,8 +93,8 @@ def test_generate_full_report(self): | |
| fake_open = mock_open() | ||
| expected_file_content = [ | ||
| call("Domain name,Domain type,Agency,Organization name,City,State,Security contact email\r\n"), | ||
| call("cdomain1.gov,Federal - Executive,Portfolio 1 Federal Agency,,,,(blank)\r\n"), | ||
| call("cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), | ||
| call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), | ||
| call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), | ||
| call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), | ||
| call("zdomain12.gov,Interstate,,,,,(blank)\r\n"), | ||
|
|
@@ -493,17 +493,17 @@ def test_domain_data_full(self): | |
| # sorted alphabetially by domain name | ||
| expected_content = ( | ||
| "Domain name,Domain type,Agency,Organization name,City,State,Security contact email\n" | ||
| "defaultsecurity.gov,Federal - Executive,Portfolio1FederalAgency,,,,(blank)\n" | ||
| "cdomain11.gov,Federal - Executive,WorldWarICentennialCommission,,,,(blank)\n" | ||
| "adomain10.gov,Federal,ArmedForcesRetirementHome,,,,(blank)\n" | ||
| "ddomain3.gov,Federal,ArmedForcesRetirementHome,,,,[email protected]\n" | ||
| "cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" | ||
| "defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" | ||
| "adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n" | ||
| "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,[email protected]\n" | ||
| "zdomain12.gov,Interstate,,,,,(blank)\n" | ||
| ) | ||
|
|
||
| # Normalize line endings and remove commas, | ||
| # spaces and leading/trailing whitespace | ||
| csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() | ||
| expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip() | ||
| self.maxDiff = None | ||
| self.assertEqual(csv_content, expected_content) | ||
|
|
||
| @less_console_noise_decorator | ||
|
|
@@ -533,16 +533,16 @@ def test_domain_data_federal(self): | |
| # sorted alphabetially by domain name | ||
| expected_content = ( | ||
| "Domain name,Domain type,Agency,Organization name,City,State,Security contact email\n" | ||
| "defaultsecurity.gov,Federal - Executive,Portfolio1FederalAgency,,,,(blank)\n" | ||
| "cdomain11.gov,Federal - Executive,WorldWarICentennialCommission,,,,(blank)\n" | ||
| "adomain10.gov,Federal,ArmedForcesRetirementHome,,,,(blank)\n" | ||
| "ddomain3.gov,Federal,ArmedForcesRetirementHome,,,,[email protected]\n" | ||
| "cdomain11.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" | ||
| "defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" | ||
| "adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n" | ||
| "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,[email protected]\n" | ||
| ) | ||
|
|
||
| # Normalize line endings and remove commas, | ||
| # spaces and leading/trailing whitespace | ||
| csv_content = csv_content.replace(",,", "").replace(",", "").replace(" ", "").replace("\r\n", "\n").strip() | ||
| expected_content = expected_content.replace(",,", "").replace(",", "").replace(" ", "").strip() | ||
| self.maxDiff = None | ||
| self.assertEqual(csv_content, expected_content) | ||
|
|
||
| @less_console_noise_decorator | ||
|
|
||