syncing master

This commit is contained in:
Senad Uka
2017-11-21 17:11:29 +01:00
parent 0eee92660a
commit b4e45199b7
47 changed files with 5666 additions and 263 deletions

View File

@@ -367,7 +367,6 @@ class CalculatorTest(unittest.TestCase):
)
self.site.power_stations = [power_station_1, power_station_2]
assert_array_equal(self.subject.compute_bom(), expected)
def test_documentation_bom(self):
@@ -426,7 +425,7 @@ class CalculatorTest(unittest.TestCase):
('512661', 2),
('512662', 4),
('512663', 2),
('512676', 0),
('523923', 0),
('512910', 1),
('513007', 50),
('513299', 0),
@@ -440,8 +439,6 @@ class CalculatorTest(unittest.TestCase):
('513832', 0),
('513833', 670),
('513836', 0),
('513841', 196),
('513842', 196),
('513843', 262),
('513844', 214),
('514056', 1000),
@@ -455,9 +452,9 @@ class CalculatorTest(unittest.TestCase):
('514440', 0),
('514477', 2),
('514478', 0),
('514685', 0),
('514686', 1),
('514687', 0),
('523924', 0),
('523921', 1),
('523922', 0),
('514697', 1),
('514698', 1),
('514865', 50),
@@ -480,19 +477,19 @@ class CalculatorTest(unittest.TestCase):
('520306', 0),
('521031', 2),
('521363', 0),
('521794', 0),
('521795', 0),
('521797', 0),
('521798', 0),
('522020', 0),
('805615', 2),
('521794', 196),
('521795', 196),
('anchors', 262),
('ballast', 6786),
('modules', 1726)
]
assert_array_equal(sorted(self.subject.documentation_bom()), expected)
assert_array_equal(sorted(self.subject.documentation_bom()), sorted(expected))
# Performance Tests