Merge 8e8ae44 into bfa00de

maven_lambda/metadata.py

@@ -241,6 +241,11 @@ def _fetch_extension_from_pom_file_content(bucket_name, pom_key):
 
     root = tree.getroot()
     packaging_element = root.find('m:packaging', XML_NAMESPACES)
+
+    # Bug 1616010 - Jars don't necessarily specify a packaging `entry`
+    if packaging_element is None:
+        return 'jar'
+
     return packaging_element.text
 
 

maven_lambda/test/test_metadata.py

@@ -281,25 +281,40 @@ def test_get_snapshots_metadata(monkeypatch):
     }]
 
 
-def test_fetch_extension_from_pom_file_content(monkeypatch):
+@pytest.mark.parametrize('xml_data, expected_format', ((
+    '''<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+<packaging>aar</packaging>
+</project>''',
+    'aar',
+), (
+    '''<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+<packaging>jar</packaging>
+</project>''',
+    'jar',
+), (
+    '''<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0">
+</project>''',
+    'jar',
+)))
+def test_fetch_extension_from_pom_file_content(monkeypatch, xml_data, expected_format):
     s3_mock = MagicMock()
     bucket_mock = MagicMock()
     s3_mock.Bucket.return_value = bucket_mock
 
     def fake_download(_, destination):
         with open(destination, 'w') as f:
-            f.write('''<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0">
-  <packaging>aar</packaging>
-</project>''')
+            f.write(xml_data)
 
     bucket_mock.download_file.side_effect = fake_download
 
     monkeypatch.setattr('maven_lambda.metadata.s3', s3_mock)
 
     assert _fetch_extension_from_pom_file_content('some_bucket_name',
         'maven2/org/mozilla/components/browser-domains/0.30.0-SNAPSHOT/browser-domains-0.30.0-20181030.164630-2.pom',
-    ) == 'aar'
+    ) == expected_format
 
     s3_mock.Bucket.assert_called_once_with('some_bucket_name')