merge with upstream

2017-12-20 20:27:55 +01:00
parent 8beef5faea
commit 2ea9e2e702
12 changed files with 237 additions and 81 deletions
--- a/test/calculators/ebom_calculator_test.py
+++ b/test/calculators/ebom_calculator_test.py
@@ -1118,7 +1118,6 @@ class EbomCalculatorTest(unittest.TestCase):
            cable_support_lid: 0,
            rear_skirt_1_1: 0,
            monitor_controller_480_v: 1,
-            ethernet_plug: 2,
        }

        assert_dictionary_equal(self.subject.compute_ebom(), expected_output)