Skip to content

Commit 83695f9

Browse files
committed
Address PR review comments
* Update test case code for clarity * Remove un-needed blank lines * Update Windows azure pipeline to use python3.7.4 Addresses: #32 Signed-off-by: Steven Esser <[email protected]>
1 parent 2ab7b77 commit 83695f9

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
python_version: '3.6'
6363
python_architecture: 'x86'
6464
py37:
65-
python_version: '3.7.3'
65+
python_version: '3.7.4'
6666
python_architecture: 'x86'
6767

6868
- template: etc/ci/azure-win.yml

tests/test_license_expression.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -554,11 +554,13 @@ def test_parse_simplify_and_contain_and_equal(self):
554554

555555
def test_parse_simplify_no_sort(self):
556556
licensing = Licensing()
557+
expr = licensing.parse('gpl-2.0 OR apache-2.0')
558+
expr2 = licensing.parse('apache-2.0 OR gpl-2.0')
557559

558-
expr = licensing.parse('gpl-2.0 OR apache-2.0 OR gpl-2.0')
559-
560-
self.assertEqual(expr.simplify(), expr.simplify(sort=False))
561-
self.assertNotEqual(expr.simplify().pretty(), expr.simplify(sort=False).pretty())
560+
self.assertEqual(expr, expr2)
561+
self.assertEqual(expr.simplify(), expr2.simplify())
562+
self.assertEqual(expr.simplify(sort=False), expr2.simplify())
563+
self.assertNotEqual(expr.simplify(sort=False).pretty(), expr2.pretty())
562564

563565
def test_license_expression_is_equivalent(self):
564566
lic = Licensing()

0 commit comments

Comments
 (0)