Merge branch 'ThorstenHarter-develop' into develop

Author: pombredanne

src/formattedcode/output_spdx.py

@@ -292,10 +292,11 @@ def write_spdx(output_file, results, scancode_version, scancode_notice,
     # Therefore in one case we do nothing (rdf) and in the other case we
     # encode to UTF8 bytes.
 
-    from StringIO import StringIO
-    spdx_output = StringIO()
-    write_document(doc, spdx_output, validate=True)
-    result = spdx_output.getvalue()
-    if as_tagvalue:
-        result = result.encode('utf-8')
-    output_file.write(result)
+    if package.files:
+      from StringIO import StringIO
+      spdx_output = StringIO()
+      write_document(doc, spdx_output, validate=True)
+      result = spdx_output.getvalue()
+      if as_tagvalue:
+          result = result.encode('utf-8')
+      output_file.write(result)

tests/formattedcode/data/spdx/empty/expected.tv

@@ -0,0 +1 @@
+# No results for package 'scan'.

tests/formattedcode/data/spdx/empty/scan/somefile

@@ -269,3 +269,22 @@ def test_spdx_rdf_with_or_later_license_does_not_fail():
             '--license-diag', test_file, '--output-spdx-rdf', result_file]
     run_scan_plain(args)
     check_rdf_scan(expected_file, result_file)
+
+
+def test_spdx_tv_with_empty_scan():
+    test_file = test_env.get_test_loc('spdx/empty/scan')
+    result_file = test_env.get_temp_file('spdx.tv')
+    expected_file = test_env.get_test_loc('spdx/empty/expected.tv')
+    args = ['--license', '--strip-root', '--info', '--only-findings', test_file, '--output-spdx-tv', result_file]
+    run_scan_plain(args)
+    check_tv_scan(expected_file, result_file, regen=True)
+
+
+def test_spdx_rdf_with_empty_scan():
+    test_file = test_env.get_test_loc('spdx/empty/scan')
+    result_file = test_env.get_temp_file('spdx.rdf')
+    args = ['--license', '--strip-root', '--info', '--only-findings', test_file, '--output-spdx-rdf', result_file]
+    run_scan_plain(args)
+    expected = "<!-- No results for package 'scan'. -->\n"
+    results = open(result_file).read()
+    assert expected == results